Joel Dice 525f733171 Merge branch 'master' into compiler
Conflicts:

	src/compile.cpp
	src/compiler.cpp
	src/compiler.h
2008-04-13 13:48:20 -06:00
..
2008-04-13 13:48:20 -06:00
2007-07-24 18:34:45 -06:00