nicolar - 2010-11-04

Could you please test it again with latest git version?