Per I Mathisen - 2008-07-30

Compile fix patch