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)
commit360a34527c0e33c701903a48696de79c078271ff
tree57e872dfa63fe956971628d35b1c0d3ca847868e
parent15e5c673b5ce1c114e10fde42b1cf7f09add347c
parent545b87e14c5d33c8186f7206a669a646eb16cc15
Merge branch 'master' into 0.11