Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves Marcoz <yves@marcoz.org>
Sat, 14 Aug 2010 04:56:11 +0000 (21:56 -0700)
committerYves Marcoz <yves@marcoz.org>
Sat, 14 Aug 2010 04:56:11 +0000 (21:56 -0700)

Trivial merge