Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 15:14:03 +0000 (16:14 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 3 Nov 2011 15:14:03 +0000 (16:14 +0100)

Trivial merge