Merge changes from emacs-23 branch.

diff --cc lisp/cedet/ChangeLog
index df02d554004478e537c63926f7d642aeafff47d6,5b75dfb5048436751b913e8a22734be88ccce8d4..d99c3fd0d95480c4e80618733a1a533c4fd1ae0e
--- 1/lisp/cedet/ChangeLog
--- 2/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@@ -1,11 -1,11 +1,19 @@@
+ 2010-09-25  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * ede/linux.el (ede-project-class-files):
+       * ede/generic.el (ede-generic-new-autoloader):
+       * ede/emacs.el (ede-project-class-files):
+       * ede/simple.el (ede-project-class-files):
+       * ede/cpp-root.el (ede-project-class-files): Fix require name.
+ 
 +2010-09-25  Juanma Barranquero  <lekktu@gmail.com>
 +
 +      * semantic/lex.el (semantic-ignore-comments): Doc fix.
 +
 +      * semantic/symref/list.el (semantic-symref-list-rename-open-hits):
 +      Fix typo in error message.
 +      (semantic-symref-list-map-open-hits): Fix typo in docstring.
 +
  2010-09-21  Eric Ludlam  <zappo@gnu.org>
  
        Synch SRecode to CEDET 1.0.