Merge change 26253 into eclair

* changes:
  Work around gcc 4.0.3 bug.