# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1294429426 28800
# Node ID cd1f0a1339959f68b5710e421fd95e3515a691cc
# Parent  663605a4c7f47dbc2c7c73e4e06d7e000cb76575# Parent  18a939752b8a02cc4ac80901d704ee2347d1c8c8
Merge from mainline.