Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:40:08 +0000 (15:40 +0100)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 7 Dec 2010 14:40:08 +0000 (15:40 +0100)

Trivial merge