20130605
Merge branch 'master' of https://github.com/wangmingshuo/qt_workspace