Please let me know if you notice problems. Merges will now take place every
weekend.

The ChangeLog still needs updating. I will fix that before the next merge.

-- 
John Wiegley                  GPG fingerprint = 4710 CF98 AF9B 327B B80F
http://newartisans.com                          60E1 46C4 BD1A 7AC1 4BA2