Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:57 +0000 (10:31 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 2 Nov 2011 09:31:57 +0000 (10:31 +0100)
commit59769ca0c8fe6fdc649a85a55d74608d63243c8e
tree8b1d05cf3651858249a82dae107590c277502698
parente8910763b4e3f91a1b1bd23917897bd230e1ea24
parent814c3f983b2efe3e289e7726322023f1ea3e80cb
Merge branch 'master' into 0.11
configure.ac