forced a merge again, having eden re-install eclipse and Git
Chris Knue (i did the previous one too)