Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 11:29:21 +0000 (13:29 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 11:29:21 +0000 (13:29 +0200)
commita7d614b963fe1a5b3b8ec3dc38d21ebc06b22120
tree377b721f3134dd714aa05ba7f3db39e2412e84a2
parentd26f7319e9e32968bcb43c68304bdf524e36f1f8
parent8e2c5833f16551e77057c50768f1c86d6254e73b
Merge branch 'master' into 0.11