Stefan W - 2011-07-23

Patch file against SVN checkout v41