am 66e06205: Another gcc 4.0.3 workaround.

Merge commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a' into eclair-mr2-plus-aosp

* commit '66e06205030cfc72f9aeeac57acfd6cbff0c1b8a':
  Another gcc 4.0.3 workaround.