From: Max Waterman <david.waterman@nokia.com>
Date: Thu, 22 Apr 2010 15:48:33 +0000 (+0300)
Subject: Merge branch 'master' of https://vcs.maemo.org/git/ptas
X-Git-Url: https://vcs.maemo.org/git/?p=ptas;a=commitdiff_plain;h=830ae95a0e8fb86cd0a826cc4cb045f44375c1ab

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

Conflicts:
	zouba/src/route_p.cpp
---

830ae95a0e8fb86cd0a826cc4cb045f44375c1ab