Merge branch 'master' of https://git.maemo.org/projects/feedingit
authorYves <ymarcoz@n900-sdk.(none)>
Mon, 8 Feb 2010 01:02:09 +0000 (17:02 -0800)
committerYves <ymarcoz@n900-sdk.(none)>
Mon, 8 Feb 2010 01:02:09 +0000 (17:02 -0800)

Trivial merge