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)
commit2c11326adf09324a9e072459b835cd59724b4a86
tree25a16d04080ccc64f6bcc0cac88b6593ec2e7885
parentc7fb142e9d6110164b27df8e4349f947c61f080b
parent04866fc6569a914081afb4afe8124052f2451ccc
Merge commit 'origin'