Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
Conflicts: src/plugins/qt4projectmanager/qtversionmanager.cpp
src/libs/cplusplus/pp-fwd.h
0 → 100644
Conflicts: src/plugins/qt4projectmanager/qtversionmanager.cpp