Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000 (11:02 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 4 Nov 2011 10:02:32 +0000 (11:02 +0100)
commite98c1e2a95b1b61e4624ca0a78811e388a57ae71
treeeccc4f8560758663d57f8bf6eed3a1f9ae176235
parent9c044ac66ec9c76ac8e8254c1be324e5b9f5c41e
parent6c290ab6de7f9ea844c685895ace117f5cdeb93f
Merge branch 'master' into 0.11

Conflicts:
configure.ac