am 4d0bf120: (-s ours) Merge change I08c19bee into eclair
Merge commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe' into eclair-mr2 * commit '4d0bf1201edd3dd8da5b9f07379336390bd234fe': DO NOT MERGE: Another gcc 4.0.3 workaround.
This commit is contained in: