Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-10-18 14:32:05 +02:00
parent e1e5cda8dc
commit de91ed89cf

Diff content is not available