John Pye - 2011-01-05

woops, I entered this bug but wasn't logged in. it's my bug though.