Merge branch 'master'; commit 'jtellier/set-account-name'
authorCosimo Cecchi <cosimoc@gnome.org>
Thu, 27 Aug 2009 15:08:25 +0000 (17:08 +0200)
committerCosimo Cecchi <cosimoc@gnome.org>
Thu, 27 Aug 2009 15:08:25 +0000 (17:08 +0200)

Trivial merge