Updates for GCC 4.6

Conflicts:

	maek.sh