Simon McVittie - 2010-06-28

proposed patch