michube - 2010-06-15

small fixes for current trunk