Merge commit 'origin'
authorJohan Dahlin <johan@gnome.org>
Mon, 6 Jul 2009 14:05:11 +0000 (11:05 -0300)
committerJohan Dahlin <johan@gnome.org>
Mon, 6 Jul 2009 14:05:11 +0000 (11:05 -0300)

Trivial merge