Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Jun 2011 13:20:37 +0000 (15:20 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 14 Jun 2011 13:20:37 +0000 (15:20 +0200)

Trivial merge