Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:22:05 +0000 (12:22 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 26 Mar 2012 10:22:05 +0000 (12:22 +0200)

Trivial merge