Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 15:14:03 +0000 (16:14 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 15:14:03 +0000 (16:14 +0100)
commitd098205996e41e26a1d639dec5481b4e8eed32be
tree95ca1978f85172735c50ff8ee93f0c0a7a1c2c8d
parent7a91860832830c9740548a3bae85b144bbc42af6
parentb28b3223fd0b909bb85f3f7edda121a1d38bc244
Merge branch 'master' into 0.11