Merge branch '0.8'
commit9e4215fcc4b9c9bcf6d8a1dbfad76219710ca682
authorBenjamin Otte <otte@gnome.org>
Wed, 24 Sep 2008 13:41:23 +0000 (24 15:41 +0200)
committerBenjamin Otte <otte@gnome.org>
Wed, 24 Sep 2008 13:41:23 +0000 (24 15:41 +0200)
treeb0ed238540d82fee0c9f971dbe66ea357c61619d
parenta4c5787b017072026f185cb5a891729c44e49cd5
parentd22d7510281b93e094afa621997ec7ffed35b247
Merge branch '0.8'