# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295675549 28800
# Node ID 6178cf733e6f3ee64d89298656d63caca9a8f9f5
# Parent  c81ff7082a9afcb3faca8e4dcdf85517cfb8bb9d# Parent  744ddded8b6aecaf9d1cbaeaf3f8781affc6983f
Merge from mainline.