Patch for /trunk/source/src/mc.h - manual fix of merge conflict

[GoogleCodeExporter]

last commit was a merge conflict that didn't get manually resolved. this just 
takes your commit and forces it.

Original issue reported on code.google.com by mega...@gmail.com on 12 Jun 2012 at 5:12

Attachments:

• mc.h.patch