Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Mon, 2 Aug 2010 12:59:14 +0000 (15:59 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Mon, 2 Aug 2010 12:59:14 +0000 (15:59 +0300)
commit39a1b59046811e667d36a05661ad8bc4b974efef
tree77e2d4fdfb009b75a641c6ebbc4ca83979caa9df
parent2b955a3b2266ef5aedcc273ccef37cde795ed02c
parent74c714500280307b8f611d4075ab4b91032ef2ee
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
tests/coordinates/geocoordinate/testgeocoordinate.cpp