From: Alan Ezust <ezust@us...> - 2011-01-27 18:22:46
Sorry, I should have just merged with conflict theirs. I was making
things harder for myself.
On Thu, Jan 27, 2011 at 9:35 AM, Kazutoshi Satoda
> Alan Ezust wrote:
>> no, it was a hand-edit based on merge request# 3159591 after vampire
>> committed the same thing to trunk.
> I took a look on r19263 made by Vampire. But there are some differences
> between trunk and 4.4.x which I don't know why.