Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 14:39:26 +0000 (16:39 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 16 Aug 2011 14:39:26 +0000 (16:39 +0200)
commit7c147e48ea4f7d66bd732faa32418c48e9a6d8c6
tree6351614ff86b8b047ff6c07ac9f7ce404b48450b
parent6fa73b255278edf0350b7860beca72abd5f97633
parent6759a4b9b01c8472fb1854581a3d09c822a22954
Merge branch 'master' into 0.11