Merge from trunk
commitc566235d981eba73c88bbff00b6a1d88360b6e9f
authorStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Aug 2010 05:42:48 +0000 (11 07:42 +0200)
committerStefan Monnier <monnier@iro.umontreal.ca>
Wed, 11 Aug 2010 05:42:48 +0000 (11 07:42 +0200)
treef8d653add3570fe750a83d1123ed35022e0bf4ef
parent0bfdb86f425a88fe43ebc88851c6f9a6418e1862
parent490b89acab3e759426ede25c31c94268df55e925
Merge from trunk
14 files changed:
lisp/ChangeLog.trunk
lisp/help-fns.el
src/ChangeLog.trunk
src/alloc.c
src/buffer.c
src/data.c
src/doc.c
src/eval.c
src/fns.c
src/image.c
src/keyboard.c
src/lisp.h
src/lread.c
src/print.c