Merged r4608 from trunk (repository: switch darcs cat test if cat supports).
Authored by: tmaruyama 2011-01-01
Parent: [r4608]
Child: [r4610]