Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)
commitfbbbe8a3aa771835bd0f2f2e48775010902bf9cb
tree57e872dfa63fe956971628d35b1c0d3ca847868e
parent360a34527c0e33c701903a48696de79c078271ff
Merge branch 'master' into 0.11