Merge branch 'master' into 0.11
authorWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 17:01:39 +0000 (19:01 +0200)
committerWim Taymans <wim.taymans@collabora.co.uk>
Wed, 17 Aug 2011 17:01:39 +0000 (19:01 +0200)

No differences found