# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295641627 28800
# Node ID a102f5772eaa41ac856eb42068671a49b3691cfb
# Parent  51005885fe3954c50f345c3276ede5cde4608d4c# Parent  c729a73f3e52648a5dbef5747116eff562318711
Merge from mainline.