Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 27 Sep 2011 15:54:02 +0000 (17:54 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 27 Sep 2011 15:54:02 +0000 (17:54 +0200)

Trivial merge