Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:40:46 +0000 (09:40 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Thu, 4 Aug 2011 07:40:46 +0000 (09:40 +0200)

No differences found