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

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/coreplugin/editormanager/stackededitorgroup.cpp

diff --cc src/plugins/coreplugin/editormanager/editormanager.cpp
Simple merge

diff --cc src/plugins/coreplugin/editormanager/openeditorsview.cpp
index 2716d97,77e44fa..e58b156
--- 1/src/plugins/coreplugin/editormanager/openeditorsview.cpp
--- 2/src/plugins/coreplugin/editormanager/openeditorsview.cpp
+++ b/src/plugins/coreplugin/editormanager/openeditorsview.cpp
@@@ -32,9 -32,9 +32,9 @@@
  ***************************************************************************/
  
  #include "openeditorsview.h"
 -#include "editorgroup.h"
  #include "editormanager.h"
- #include "coreimpl.h"
 +#include "editorview.h"
+ #include "icore.h"
  
  #include <coreplugin/coreconstants.h>
  #include <coreplugin/filemanager.h>

diff --cc src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
index 7d27b72,08e63b2..2d36105
--- 1/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
--- 2/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
+++ b/src/plugins/coreplugin/editormanager/stackededitorgroup.cpp
@@@ -33,8 -33,6 +33,7 @@@
  
  #include "stackededitorgroup.h"
  #include "editormanager.h"
- #include "coreimpl.h"
 +#include "editorview.h"
  
  #include <utils/qtcassert.h>
  

diff --cc src/plugins/coreplugin/mainwindow.cpp
Simple merge

diff --cc src/plugins/coreplugin/outputpane.cpp
Simple merge

diff --cc src/plugins/perforce/perforceplugin.cpp
Simple merge

diff --cc src/plugins/projectexplorer/projectexplorer.cpp
Simple merge

diff --cc src/plugins/projectexplorer/projecttreewidget.cpp
Simple merge