Release 2007-06-15

Bugfixes from the West