Merge branch 'stable' of git://qt.gitorious.org/qt/qtdeclarative into st
Merge branch 'st' of git://github.com/jfaust/qtdeclarative into st