jachym - 2009-07-24

This applies for 2.1-a1 as well.