Arnaldo Carvalho de Melo <acme@conectiva.com.br>).  This
touches virtually every file but the changes are fairly
superficial.

Please check I haven't broken your favourite AF/hardware
type during the conversion.