Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves Marcoz <yves@marcoz.org>
Mon, 19 Sep 2011 23:07:06 +0000 (16:07 -0700)
committerYves Marcoz <yves@marcoz.org>
Mon, 19 Sep 2011 23:07:06 +0000 (16:07 -0700)

Trivial merge