donb
committed
on 12 Jul 09
Non-info file merge results, with conflicts resolved.