Anonymous - 2010-12-29

Patch to fix compilation problems