Merge branch 'master' of https://vcs.maemo.org/git/ptas
authorMax Waterman <david.waterman@nokia.com>
Thu, 22 Apr 2010 15:48:33 +0000 (18:48 +0300)
committerMax Waterman <david.waterman@nokia.com>
Thu, 22 Apr 2010 15:48:33 +0000 (18:48 +0300)
commit830ae95a0e8fb86cd0a826cc4cb045f44375c1ab
tree3452fe59ed4a41fbcea85bed619e8b4406638e59
parent90527f16c3240acbaf237d1cd630580df590c9df
parent618abe587da29d6c88fddebd1d6b57f6a4f37a58
Merge branch 'master' of https://vcs.maemo.org/git/ptas

Conflicts:
zouba/src/route_p.cpp