Merge branch 'master' into release

This commit is contained in:
snowleo 2011-07-21 00:31:39 +02:00
commit b317aef8c9

Binary file not shown.