Merge commit 'origin'
authorJohan Dahlin <jdahlin@litl.com>
Tue, 17 Feb 2009 18:01:14 +0000 (15:01 -0300)
committerJohan Dahlin <johan@gnome.org>
Tue, 17 Feb 2009 18:01:14 +0000 (15:01 -0300)

Trivial merge