Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-09-26 22:31:17 +02:00
parent 33180df8ba
commit 1e68f2d312

Diff content is not available