base

DO NOT MERGE: Another gcc 4.0.3 workaround.

Temporarily make a function public that doesn't need to be.  When
host gcc-4.0.3 is gone from the build servers we can undo this.

(Cherry-picked from eclair-mr2.)