Merge remote-tracking branch 'steven/type-emulator' into type-emulator

This commit is contained in:
Nico Schottelius 2011-09-19 14:12:19 +02:00
commit b4b354305c