Nathan Gibbs - 2008-05-22

Diff file of the changes described above.