Merging compiler warning fix. Patch by Mark H Weaver <mhw@netris.org>.