# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1285442381 14400
# Node ID bc67a5497dda9e5c58d2d80a08f71433aa45e212
# Parent  72166a5a538c432054dcbae11aff0f0c9c0facc3# Parent  6a4262ac6a5dd5a796069fae6e685abce60e212f
Merge changes from emacs-23 branch.