Marc Butler - 2008-07-01

unified diff against version 0.2.0