Merging small changes; updating the CHANGES file
Authored by: arjenmarkus 2006-05-17
Parent: [r18]
Child: [r20]