code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

author	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 24 Aug 2011 21:20:36 +0000 (14:20 -0700)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Wed, 24 Aug 2011 21:20:36 +0000 (14:20 -0700)
commit	011ba6eaacfa50cc9871d0cfea34e8f0a7a5bc43
tree	ced7a98ff1eb289559da6ebfda46a8e436640da6	tree
parent	fe4496a6e27ac892283b8568adbd12831868cc54	commit \| diff
parent	f22f4808a08e8f985d5e6175bbd13d5260e1ab1a	commit \| diff

Merge from trunk.