Merge branch 'master' of https://vcs.maemo.org/git/situare

author Jussi Laitinen <jupe@l3l7588.ixonos.local>

Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)

committer Jussi Laitinen <jupe@l3l7588.ixonos.local>

Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
author Jussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
committer Jussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
diff --cc src/engine/engine.cpp
Simple merge
diff --cc src/ui/friendlistitem.cpp
Simple merge
author	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
committer	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Fri, 14 May 2010 12:43:02 +0000 (15:43 +0300)
		1	2
src/engine/engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/friendlistitem.cpp	patch \|	diff1 \|	diff2 \|	blob \| history