# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1279295158 14400
# Node ID f2072d485e00c5f955e0de3cf02251664bd768d6
# Parent  9e514d1076b4c8f2a58f1e7e77ad32accac5b009# Parent  051595eb9b58dcb8a8c7c2092b8f39375a068274
Merge changes from emacs-23 branch.