Andrew - 2004-12-09

non-gui patch