Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 12:05:42 +0000 (14:05 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 6 Oct 2011 12:05:42 +0000 (14:05 +0200)
commit9edd94d793ba637679bab221fe48c0d02d46c776
tree44062ada764a50736faa0fd584f425bc1ead5091
parent6bd65058c46d744a03aa52b84f17425502c6127b
Merge branch 'master' into 0.11