Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

share/qtcreator/translations/qtcreator_de.ts

share/qtcreator/translations/qtcreator_es.ts

src/plugins/cpptools/cppmodelmanager.cpp

src/plugins/cpptools/cppmodelmanager.h

src/plugins/qt4projectmanager/profilereader.cpp

src/plugins/qt4projectmanager/profilereader.h

src/plugins/qt4projectmanager/qt4nodes.cpp

src/plugins/qt4projectmanager/qt4project.cpp

src/shared/proparser/profileevaluator.cpp

src/shared/proparser/profileevaluator.h