Merge branch 'master' into stacked_friends
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 10 May 2010 10:17:29 +0000 (13:17 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 10 May 2010 10:17:29 +0000 (13:17 +0300)
commitb100ec5b02ac7f2ecf5d863871572c5ff8945b63
tree208c0ff9afdd6a253e7f41bf36e77bfa8f26970b
parentd3f94568bd7174a298cdaa13bac24ed94af8a40e
parentee888a12aef2b64b05d2a575380e448ffce76cce
Merge branch 'master' into stacked_friends

Conflicts:
images.qrc
src/src.pro
images.qrc
src/map/ownlocationitem.cpp
src/src.pro