Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 17:34:48 +0000 (18:34 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 17:34:48 +0000 (18:34 +0100)
commit2091480c547d30367c47fb590db791def1351000
tree142f9ef6123d49ed79cfed4481f628d71bcc4a08
parent5684c1200bc91b9bf3b42240234b3820176ecb78
parent609ae9b8125fd0a9b18401ebadc2bce5e0522ae1
Merge branch 'master' into 0.11