Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
commit139cb43b14a4779b165fed915364f36aa80c21d8
tree44062ada764a50736faa0fd584f425bc1ead5091
parent9edd94d793ba637679bab221fe48c0d02d46c776
Merge branch 'master' into 0.11