Merge branch '0.8'
commit6579cea20fc9a5eac0c98464ec41fa8cb6488659
authorBenjamin Otte <otte@gnome.org>
Thu, 20 Nov 2008 10:16:09 +0000 (20 11:16 +0100)
committerBenjamin Otte <otte@gnome.org>
Thu, 20 Nov 2008 10:16:09 +0000 (20 11:16 +0100)
tree1e82aa379bd62a14a7e57a271ba59e5c945a6ad8
parent2ea5b413acf2637097ec8312f1ae6ea797003ee4
parentf13dd37ca4cbf1bc5b80fa2fe215be1bf743d164
Merge branch '0.8'