vchoi_fork

[svn-r19485] Description:
	Bring r19484 from trunk to 1.8 branch:

    Clean up formatting a bit.

Tested on:
    FreeBSD/32 6.3 (duty) w/debug
    (Too minor to require h5committest)