vchoi_fork

[svn-r14073] Description:
	Re-order several switch statements to match the ordinal numbering of
enumerated types.

Tested on:
	None - too simple to require