Merge from emacs-24; up to 2012-12-24T06:24:08Z!eggert@cs.ucla.edu

diff --cc doc/lispintro/ChangeLog
Simple merge

diff --cc doc/lispintro/emacs-lisp-intro.texi
Simple merge

diff --cc doc/lispref/ChangeLog
index 42f5b5f,8947685..16866d5
--- 1/doc/lispref/ChangeLog
--- 2/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@@ -1,4 -1,8 +1,8 @@@
 -2013-02-27  Bastien Guerry  <bzg@gnu.org>
+ 2013-03-03  Glenn Morris  <rgm@gnu.org>
+ 
+       * objects.texi (Symbol Type): Fix typo.
+ 
 +2013-02-28  Bastien Guerry  <bzg@gnu.org>
  
        * variables.texi (File Local Variables): Fix reference.