Changes made by Anton de Wet (ascii@icenium.phun.net).
Merge branch 'master' of https://github.com/hamloubser/hoodeye320.git