Bug ZK-2449: upload button affects button layout flow
Merge pull request #131 from hanhsu/B65-ZK-2449

Bug ZK-2449: upload button affects button layout flow
Bug ZK-2380: IE8 causing script error with borderlayout and toolbar
Merge branch 'B65-ZK-2380' of https://github.com/hanhsu/zk into 6.5
Merge remote-tracking branch 'upstream/6.5'