Joshua Warner 9327043bc5 Merge branch 'master' into wip ...

Conflicts:
	makefile
	src/codegen/arm/assembler.cpp
	src/codegen/powerpc/assembler.cpp
	src/codegen/x86/assembler.cpp

2013-02-27 19:27:07 -07:00

..

avian

Merge branch 'master' into wip

2013-02-27 19:27:07 -07:00