Merge from mainline.

diff --cc admin/ChangeLog
index 0e0d9f2,e005966..e8b2d57
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,14 -1,8 +1,19 @@@
- 2011-01-09  Paul Eggert  <eggert@cs.ucla.edu>
++2011-01-14  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Update copyright notes to match recent gnulib-related changes.
 +      * notes/copyright: Add aclocal.m4, m4/*.m4, lib/Makefile.in,
 +      arg-nonnull.h, c++defs.h, compile, depcomp, missing,
 +      warn-on-use.h, lib/*.[ch], lib/gnulib.mk.  Remove src/mktime.c,
 +      lib-src/getopt1.c, lib-src/getopt_int.h (files are now in lib and
 +      are subsumed by the lib/*.[ch] rule).  Remove m4/getopt.m4 (now
 +      subsumed by m4/*.m4 rule).  config.guess, config.sub, and
 +      doc/man/texinfo.tex are now copied in from gnulib.
 +
+ 2011-01-14  Glenn Morris  <rgm@gnu.org>
+ 
+       * bzrmerge.el: Require cl when compiling.
+       (bzrmerge-merges): Doc fix.
+ 
  2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        * notes/copyright: There's only one install-sh, not two, so fix a