Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:08:38 +0000 (19:08 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Mon, 13 Jun 2011 17:08:38 +0000 (19:08 +0200)

Trivial merge