Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:45:04 +0000 (09:45 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 17 May 2011 07:45:04 +0000 (09:45 +0200)

Trivial merge