Merge changes from emacs-23 branch.

author Chong Yidong <cyd@stupidchicken.com>

Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)

committer Chong Yidong <cyd@stupidchicken.com>

Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)
author Chong Yidong <cyd@stupidchicken.com>
Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)
committer Chong Yidong <cyd@stupidchicken.com>
Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)
diff --cc src/ChangeLog
Simple merge
diff --cc src/frame.c
Simple merge
author	Chong Yidong <cyd@stupidchicken.com>
	Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)
committer	Chong Yidong <cyd@stupidchicken.com>
	Sat, 10 Jul 2010 19:01:01 +0000 (15:01 -0400)
		1	2
src/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
src/frame.c	patch \|	diff1 \|	diff2 \|	blob \| history