Merge branch 'master' into 0.11

This commit is contained in:
Wim Taymans 2011-05-18 13:19:31 +02:00
commit 6ad530a8b0