Emanuel Muckenhuber
committed
on 03 Apr 09
port some missing changes to trunk