Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 11:29:21 +0000 (13:29 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 4 Oct 2011 11:29:21 +0000 (13:29 +0200)
commit6bd65058c46d744a03aa52b84f17425502c6127b
tree44062ada764a50736faa0fd584f425bc1ead5091
parent0d0257cfd4e5e172cbf6661028c888fb4accca20
parentab1d420f8891c54d6ec6627f697c67dca9a6fba5
Merge branch 'master' into 0.11