Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves Marcoz <yves@marcoz.org>
Sat, 15 Oct 2011 16:23:34 +0000 (09:23 -0700)
committerYves Marcoz <yves@marcoz.org>
Sat, 15 Oct 2011 16:23:34 +0000 (09:23 -0700)

Trivial merge