Merge commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588' * commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588': Another gcc 4.0.3 workaround.
Merge commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588' * commit 'cad9a4b0468eb9611cc9b7d7b380d8af3fff8588': Another gcc 4.0.3 workaround.