Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:40:08 +0000 (15:40 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:40:08 +0000 (15:40 +0100)
commit8d4421b9c7e14ac14c4db73b6862bf7860e807ca
tree1a6f04d5f7d0ed066415ab17577720252b0c59a5
parentdc5162a07e31cca253a91d22c74f951e290dd751
parentffd22c918458e7889d7bdbb8cf53b3be86be0e05
Merge branch 'master' into 0.11