Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-10-27 16:13:56 +02:00
parent de91ed89cf
commit b22b0ce72d

Diff content is not available