Merge commit 'origin'
authorJohan Dahlin <jdahlin@litl.com>
Wed, 25 Feb 2009 17:38:39 +0000 (14:38 -0300)
committerJohan Dahlin <johan@gnome.org>
Wed, 25 Feb 2009 17:38:39 +0000 (14:38 -0300)

Trivial merge