Don Schwarz - 2010-04-02

Patch against trunk @ v419