Merge remote branch 'origin'
authorJohan Dahlin <johan@gnome.org>
Mon, 21 Jun 2010 22:27:27 +0000 (19:27 -0300)
committerJohan Dahlin <johan@gnome.org>
Mon, 21 Jun 2010 22:27:27 +0000 (19:27 -0300)

Trivial merge