Merge branch 'master' of https://vcs.maemo.org/git/situare
authorSami Rämö <sami.ramo@ixonos.com>
Tue, 27 Jul 2010 10:47:15 +0000 (13:47 +0300)
committerSami Rämö <sami.ramo@ixonos.com>
Tue, 27 Jul 2010 10:47:15 +0000 (13:47 +0300)
commita8042ab208924c31517d49fc1ea1e2228153f5eb
treef899782a7eeb2ec4018e9d8d2541143c8da727e5
parent168a5103f69a1d837d7df91993bcfb7486011f92
parent2fa82199980f0ffd70583ec7ed805bb410dc428c
Merge branch 'master' of https://vcs.maemo.org/git/situare

Conflicts:
src/routing/routingservice.cpp
src/routing/routingservice.cpp
src/routing/routingservice.h