Include Martin's latest fixes which build a usable maxima.fas

Package-Manager: portage-2.2.0_alpha179