Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:26:17 +0000 (17:26 +0000)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 8 Mar 2011 17:26:17 +0000 (17:26 +0000)
commite769320218e6b61a98cc92e581556ee25b2f357f
tree87338af4c0fe5a2a7982968e9ebc3abc5514a5cb
parentc63dc97adf1c1e49a7039ce8239791211cf5824a
parentd0c5b86727b9b632ccfac5ceb5481fe7faf5fcab
Merge branch 'master' into 0.11

Conflicts:
configure.ac