Merge remote branch 'origin'
authorJohan Dahlin <johan@gnome.org>
Wed, 10 Mar 2010 15:01:15 +0000 (12:01 -0300)
committerJohan Dahlin <johan@gnome.org>
Wed, 10 Mar 2010 15:01:15 +0000 (12:01 -0300)

Trivial merge