Yes, he checked in my change, and didn't copy me on the email... Also, something ate my gcc-patches email. :-(
No, I checked it in before seeing your other message with the proposed fix. My apologies for not giving credit.
(Indeed the fix is a bit different, I replaced \0 with the portable & rather than with \1/\2.java).
Paolo