2008-07-13 Jens Alfke Merged 1.0 final into 1.1 branch.