Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Fri, 11 Nov 2011 09:39:17 +0000 (10:39 +0100)

Trivial merge