From: Thibaut GRIDEL <tgridel@free.fr>
Date: Tue, 28 Dec 2010 21:16:42 +0000 (+0100)
Subject: Merge branch 'upstream'
X-Git-Url: http://git.maemo.org/git/?p=routino;a=commitdiff_plain;h=HEAD;hp=-c

Merge branch 'upstream'
---

9dffc9de96014e24d1fd1030a79317ba34c504e8