Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 11:14:19 +0000 (12:14 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 10 Nov 2011 11:14:19 +0000 (12:14 +0100)
commit15e5c673b5ce1c114e10fde42b1cf7f09add347c
tree675bcab523f993a25ef83cba035d61d943cc5e27
parentea30e91443f5062299e201e7ab5b0671d9054dc6
Merge branch 'master' into 0.11