Merge commit 'origin'
authorJohan Dahlin <jdahlin@litl.com>
Tue, 17 Feb 2009 00:58:11 +0000 (21:58 -0300)
committerJohan Dahlin <johan@gnome.org>
Tue, 17 Feb 2009 00:58:11 +0000 (21:58 -0300)

Trivial merge