Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Tue, 18 Oct 2011 12:32:05 +0000 (14:32 +0200)

No differences found