Merge: src/emacs.c now gets version number from configure.in

diff --cc src/ChangeLog
index 63ea7c2,5a3c34d..f96fe5e
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,8 -1,9 +1,14 @@@
+ 2011-01-31  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       src/emacs.c now gets version number from configure.in
+       * emacs.c (emacs_version): Set to VERSION so that it
+       is determined automatically from ../configure.in.
+ 
 +2011-01-31  Jim Meyering  <meyering@redhat.com>
 +
 +      * charset.c (load_charset_map): Don't deref NULL on failed malloc.
 +      Use xmalloc rather than malloc.
 +
  2011-01-30  Paul Eggert  <eggert@cs.ucla.edu>
  
        strftime: import from gnulib