# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295757057 28800
# Node ID f3d87590137262ffac9669e0e1d0de23b04c85a6
# Parent  9de5a68b57e1dbe652edf00ccc26073ffeed8a26# Parent  473533159689b1bc983d46f5f9b05d7f0c9eda5a
Merge from mainline.