Merge branch 'master' of https://vcs.maemo.org/git/groove into Test
authorElias Woods <EliasWoods@gmail.com>
Sat, 8 Jan 2011 00:11:32 +0000 (19:11 -0500)
committerElias Woods <EliasWoods@gmail.com>
Sat, 8 Jan 2011 00:11:32 +0000 (19:11 -0500)

Trivial merge