Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-10-08 11:17:11 +02:00
parent 9edd94d793
commit 139cb43b14

Diff content is not available