Merge commit 'origin/login_browser' into qml

author Janne Kiiski <janne.kiiski@ixonos.com>

Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)

committer Janne Kiiski <janne.kiiski@ixonos.com>

Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
author Janne Kiiski <janne.kiiski@ixonos.com>
Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
committer Janne Kiiski <janne.kiiski@ixonos.com>
Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
diff --cc src/engine/engine.cpp
Simple merge
diff --cc src/src.pro
Simple merge
author	Janne Kiiski <janne.kiiski@ixonos.com>
	Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
committer	Janne Kiiski <janne.kiiski@ixonos.com>
	Thu, 11 Nov 2010 10:02:13 +0000 (12:02 +0200)
		1	2
src/engine/engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/src.pro	patch \|	diff1 \|	diff2 \|	blob \| history