Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:28:31 +0000 (15:28 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sun, 16 Oct 2011 13:28:31 +0000 (15:28 +0200)
commite1e5cda8dcd96b22d14e4b0d2138a8875043b429
tree44062ada764a50736faa0fd584f425bc1ead5091
parent139cb43b14a4779b165fed915364f36aa80c21d8
Merge branch 'master' into 0.11