Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
	configure.exe
	tools/qdoc3/htmlgenerator.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/bin/syncqt b/bin/syncqt
index cd99288..ae60963 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -4,7 +4,7 @@
 # Synchronizes Qt header files - internal Trolltech tool.
 #
 # Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-# Contact: Qt Software Information (qt-info@nokia.com)
+# Contact: Nokia Corporation (qt-info@nokia.com)
 #
 ######################################################################