vchoi_fork

[svn-r13022] Description:
    Fix error where message type was being cleared before it was checked.

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