vchoi_fork

[svn-r12767] Description:
    Code cleanup to improve formatting & reduce compiler warnings.

Tested on:
    Linux/32 2.6 (chicago)
    Linux/64 2.6 (chicago2)