commit: 2008-08-09 Aidan Kehoe <kehoea@parhasard.net>