Anonymous - 2010-12-28

Patch to fix compilation problems