Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-11-09 12:24:37 +01:00
parent 4e8791dafd
commit ea30e91443

Diff content is not available