Merge change I08c19bee into eclair

* changes:
  DO NOT MERGE: Another gcc 4.0.3 workaround.