Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-11-10 12:14:19 +01:00
parent ea30e91443
commit 15e5c673b5

Diff content is not available