merge trunk into eclipse-project branch, and fix build on UNIX