Merge branch 'master' of https://vcs.maemo.org/git/groove master
authorElias Woods <EliasWoods@gmail.com>
Fri, 7 Jan 2011 23:25:02 +0000 (18:25 -0500)
committerElias Woods <EliasWoods@gmail.com>
Fri, 7 Jan 2011 23:25:02 +0000 (18:25 -0500)

Trivial merge