Merge branch 'master' of git://gitorious.org/qt/qtdeclarative into merge-master