Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7

Conflicts:
	doc/src/template/style/style.css
	tools/qdoc3/htmlgenerator.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp
index 5e829a4..15e8f64 100644
--- a/tools/qml/main.cpp
+++ b/tools/qml/main.cpp
@@ -248,7 +248,7 @@ int main(int argc, char ** argv)
             useNativeFileBrowser = false;
         } else if (arg == "-I" || arg == "-L") {
             if (arg == "-L")
-                fprintf(stderr, "-L option provided for compatibility only, use -I instead");
+                fprintf(stderr, "-L option provided for compatibility only, use -I instead\n");
             if (lastArg) {
                 QDeclarativeEngine tmpEngine;
                 QString paths = tmpEngine.importPathList().join(QLatin1String(":"));