Merge branch 'master' into login_browser

author Sami Rämö <sami.ramo@ixonos.com>

Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)

committer Sami Rämö <sami.ramo@ixonos.com>

Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
author Sami Rämö <sami.ramo@ixonos.com>
Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
committer Sami Rämö <sami.ramo@ixonos.com>
Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
diff --cc src/ui/locationsearchpanel.cpp
Simple merge
diff --cc src/ui/mainwindow.cpp
Simple merge
diff --cc src/ui/mainwindow.h
Simple merge
author	Sami Rämö <sami.ramo@ixonos.com>
	Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
committer	Sami Rämö <sami.ramo@ixonos.com>
	Fri, 5 Nov 2010 11:22:21 +0000 (13:22 +0200)
		1	2
src/ui/locationsearchpanel.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history