Lars Berntzon - 2009-12-10

Patch for implementing this change request