Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Sep 2011 20:31:17 +0000 (22:31 +0200)
commit7f4cf50496ef6797aaba819d0924bb5c4baf09a4
tree44154878bf094cb393c31af479377b98df192ff3
parent6a44e54b09dcc7a9d0f4499375810892a8582403
parentf4e744ff4921bef432b40128bdd0b33786e44732
Merge branch 'master' into 0.11
configure.ac