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)
commitc58582c7a88a95616fa87b81517ab8a2a76af92f
treea45e6f19ce8d6fd3ba57510984a94756e0d0ce78
parenta51b8305c70fedd6d989229c3d7ed46b200718e8
parentacf7c084c5e13de262d866b896e9b30a0739eecf
Merge commit 'origin'