r1767: Checkin of workarea. Sorry Jelmer but this overwrites some of your changes