Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 27 Sep 2011 15:54:02 +0000 (17:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 27 Sep 2011 15:54:02 +0000 (17:54 +0200)
commit036963bc8924b260e9a5fe4d68dd3c434d8aee06
tree01d1ced5795a0db6baf9d764cc885eb0f625c830
parent29e08341918cbdbd1a91dec35d2e06114f64723a
parentdc3013f925f91df6a2efc523eb75f663c4139c54
Merge branch 'master' into 0.11