Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 16:26:06 +0000 (18:26 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 24 May 2011 16:26:06 +0000 (18:26 +0200)

Trivial merge