# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295744949 28800
# Node ID 7b649f6eac4f949f4d84029115fb005f1153c898
# Parent  647e164c1f3e403b56edc1da2971179982aeaf56# Parent  27320025ed54dafcba3b498296b32a466644e480
Merge from mainline.