David Kohen - 2008-12-15

A patch to fix the behaviour to be compatible with the specifications