Jason Biegel - 2008-05-01

Patch to be used on trunk of repository