Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
[bpt/emacs.git] / src / buffer.h
diff --cc src/buffer.h
Simple merge