Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Sat, 8 Oct 2011 09:17:11 +0000 (11:17 +0200)

No differences found