Mark Miesfeld - 2009-12-21

Patch as described