Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)
commitde91ed89cfea575509ffd6816c4147e778465c2e
tree44062ada764a50736faa0fd584f425bc1ead5091
parente1e5cda8dcd96b22d14e4b0d2138a8875043b429
Merge branch 'master' into 0.11