botte - 2006-08-24

All patches in a single file.