Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:18:28 +0000 (12:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:18:28 +0000 (12:18 -0700)
commit6511acf2570df26e93e15283d593b8e81d217a78
treeaac6d8ee8a8da5174a5da4917cd88361cebb74a0
parentfd09688b0bbd5ee8011e78a1f4e794603e27232f
parent53e9fe90811730f68c4ea246cd8dee8aa22486de
Merge from trunk.
src/ChangeLog
src/emacs.c
src/print.c