# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1282507474 14400
# Node ID 4ed076eb552944b117e6a846e6f39a1f56d42841
# Parent  bcdbcc64ea7d881a59b597b62bfea3920abcf016# Parent  53205019b1958b5c07d34ad22b5f83aa24b6dc1a
Merge changes from emacs-23 branch.