Merge branch 'master' of https://vcs.maemo.org/git/mevemon
authorRyan Campbell <campbellr@gmail.com>
Tue, 20 Apr 2010 21:12:31 +0000 (15:12 -0600)
committerRyan Campbell <campbellr@gmail.com>
Tue, 20 Apr 2010 21:12:31 +0000 (15:12 -0600)

Trivial merge