Updates from git://gitorious.org/qt/qtbase.git