am dbe8bad1: Merge change 26253 into eclair

Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp

* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
  Work around gcc 4.0.3 bug.