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)
commit53104000372583319f7330fb036c096ca7af4a6b
tree8dbe45d4cebdad984031c29f31aaddccb352df76
parent6f3b004ad53947710c72d6168349cc9ca026a347
parentc577448bbdb7711a4e38fea5325e80b4b7dea058
Merge commit 'origin'