vchoi_fork

[svn-r7504] Purpose:
Bug fix

Description:
The op-snapshot checkout "ate" the next option by mistake.

Solution:
Remove the extra shift.

Platforms tested:
Can't really test it without doing a real snapshot test.
Pretty sure it is correct and will watch the result tomorrow.

Misc. update: