martin - 2009-06-06

fix for bug 2802108