Kevin - 2012-10-04

Patch to fix compile errors on newer systems