donb
committed
on 30 Aug 08
Merged the 5.4 branch to HEAD, to pick up emmanuelle's fixes before I go
off fixing a bunch of other stuff.