Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 09:02:00 +0000 (10:02 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 7 Nov 2011 09:02:00 +0000 (10:02 +0100)

Trivial merge