Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 9 Nov 2011 11:24:37 +0000 (12:24 +0100)

Trivial merge