Adam Tkac - 2009-02-12

Proposed patch