Merge branch 'master' of github.com:wooley/gante
Merge branch 'master' of github.com:wooley/gante

Conflicts:
	trunk/include/gt_Gante.h