Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-599
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-600
   Merge from erc--main--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-601
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-602
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-603
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-604
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-605
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-606
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-607
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-608
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-609
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-610
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-611
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-612
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-613
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-614
   Make byte compiler correctly write circular constants

 * emacs@sv.gnu.org/emacs--devo--0--patch-615
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-616
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-617
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-618
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-192
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-193
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-194
   Merge from emacs--devo--0

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-195
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-196
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-594

1803 files changed, 11088 insertions, 10648 deletions

diff --git a/AUTHORS b/AUTHORS
index 0afd46cab03..a48809cbc1a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -34,8 +34,8 @@ Aki Vehtari: changed bibtex.el gnus-art.el gnus-score.el gnus-sum.el
 Alakazam Petrofsky: changed hanoi.el
 
 Alan Mackenzie: wrote cc-awk.el
-and changed cc-cmds.el cc-mode.el cc-defs.el cc-engine.el cc-vars.el
-  cc-langs.el cc-styles.el cc-mode.texi lread.c cc-fonts.el cc-align.el
+and changed cc-cmds.el cc-mode.el cc-engine.el cc-defs.el cc-vars.el
+  cc-langs.el cc-mode.texi cc-styles.el cc-align.el lread.c cc-fonts.el
   programs.texi cc-subword.el isearch.el lisp.el search.texi subr.el
   text.texi buffers.texi cc-fix.el cc-mode-19.el and 16 other files
 
@@ -85,7 +85,7 @@ Alfred M. Szmidt: changed compile.el html2text.el openbsd.h
 
 Alfredo Finelli: changed TUTORIAL.it
 
-Alin C. Soare: changed hexl.el
+Alin C. Soare: changed hexl.el lisp-mode.el
 
 Ami Fischman: changed calendar.el diary-lib.el
 
@@ -127,8 +127,9 @@ Andreas Schwab: changed Makefile.in files.el lisp.h xdisp.c configure.in
   process.c and 448 other files
 
 Andreas Seltenreich: changed nnweb.el gnus.texi mm-uu.el nnslashdot.el
-  battery.el easy-mmode.el gnus-art.el gnus-ml.el gnus-srvr.el
-  gnus-start.el gnus-util.el gnus.el mm-url.el url-cookie.el url-http.el
+  battery.el easy-mmode.el gmm-utils.el gnus-art.el gnus-ml.el
+  gnus-srvr.el gnus-start.el gnus-sum.el gnus-util.el gnus.el mm-url.el
+  url-cookie.el url-http.el
 
 Andrew Choi: wrote mac-win.el
 and changed macterm.c mac.c macfns.c INSTALL macmenu.c darwin.h macterm.h
@@ -194,8 +195,8 @@ Ben Harris: changed configure.in
 Ben Key: changed w32.c w32fns.c w32menu.c makefile.w32-in w32.h w32term.c
   emacs.c gmake.defs ms-w32.h nmake.defs sound.c
 
-Ben North: changed fill.el isearch.el lisp-mode.el paren.el w32term.c
-  xfaces.c
+Ben North: changed fill.el isearch.el lisp-mode.el outline.el paren.el
+  w32term.c xfaces.c
 
 Benjamin Drieu: wrote pong.el
 
@@ -294,6 +295,8 @@ Brian Preble: changed abbrev.el apropos.el asm-mode.el doctex.el
   bug-screen.el bytecomp.el c++-mode.el c-comment.el c-fill.el c-mode.el
   and 92 other files
 
+Bruno Haible: changed INSTALL emacs.1 epaths.in info.el paths.el
+
 Bryan D. O'connor: changed make-package
 
 Bryan Henderson: changed Makefile term.el
@@ -328,18 +331,18 @@ Charlie Martin: wrote autoinsert.el
 Cheng Gao: changed MORE.STUFF flymake.el tips.texi url-dired.el
   url-file.el url-handlers.el url-http.el url-nfs.el
 
-Chong Yidong: changed cus-edit.el simple.el custom.el display.texi
+Chong Yidong: changed cus-edit.el custom.el simple.el display.texi
   longlines.el files.el text.texi custom.texi files.texi info.el
-  keyboard.c mouse.el wid-edit.el xterm.c compile.el cus-theme.el
-  frames.texi misc.texi startup.el image-mode.el keymaps.texi
-  and 182 other files
+  keyboard.c compile.el mouse.el wid-edit.el xdisp.c xterm.c cus-theme.el
+  frames.texi misc.texi startup.el image-mode.el and 184 other files
 
 Chris Hanson: changed xscheme.el scheme.el xterm.c hpux.h x11term.c
   hp9000s300.h keyboard.c process.c texinfmt.el emacsclient.c sort.el
   syntax.c texnfo-upd.el x11fns.c xfns.c dired.el fileio.c hp9000s800.h
   indent.c info.el man.el and 17 other files
 
-Chris Moore: changed dired.el Makefile.in gnus-sum.el wdired.el
+Chris Moore: changed dired.el hexl.el Makefile.in gnus-sum.el replace.el
+  tutorial.el wdired.el
 
 Chris Prince: changed w32term.c
 
@@ -387,7 +390,8 @@ Craig Mcdaniel: changed sheap.c
 
 Daiki Ueno: wrote pgg-def.el pgg-gpg.el pgg-parse.el pgg-pgp.el
   pgg-pgp5.el pgg.el starttls.el
-and changed mml2015.el gnus-agent.el gnus-srvr.el gnus-sum.el mml1991.el
+and changed gnus-sum.el mml2015.el gnus-agent.el gnus-srvr.el
+  message.texi mml1991.el
 
 Dale Hagglund: changed unexelf.c
 
@@ -405,7 +409,7 @@ Dan Christensen: changed gnus-sum.el nnfolder.el gnus-art.el
 
 Dan Nicolaescu: wrote iris-ansi.el romanian.el
 and changed term.el xterm.el hideshow.el isearch.el icon.el lisp.h
-  cus-edit.el font-lock.el sh-script.el eterm-color.ti faces.el
+  cus-edit.el faces.el font-lock.el sh-script.el eterm-color.ti
   ibuffer.el rxvt.el vhdl-mode.el xterm.c bindings.el compile.el
   dabbrev.el grep.el imenu.el outline.el and 159 other files
 
@@ -570,11 +574,11 @@ Detlev Zundel: wrote re-builder.el
 
 Dhruva Krishnamurthy: changed makefile.w32-in
 
-Diane Murray: changed erc.el erc-menu.el erc-button.el erc-match.el
-  erc-track.el erc-backend.el erc-nets.el erc-list.el erc-autoaway.el
-  erc-nickserv.el erc-compat.el erc-stamp.el erc-goodies.el
+Diane Murray: changed erc.el erc-menu.el erc-backend.el erc-button.el
+  erc-track.el erc-match.el erc-nets.el erc-list.el erc-autoaway.el
+  erc-capab.el erc-nickserv.el erc-compat.el erc-stamp.el erc-goodies.el
   erc-ibuffer.el erc-log.el Makefile erc-dcc.el erc-fill.el
-  erc-nicklist.el erc-notify.el erc-ring.el and 30 other files
+  erc-nicklist.el erc-notify.el and 30 other files
 
 Dick King: wrote uniquify.el
 
@@ -634,7 +638,7 @@ Eli Zaretskii: wrote codepage.el rxvt.el tty-colors.el
 and changed msdos.c Makefile.in makefile.w32-in files.el info.el fileio.c
   startup.el mainmake.v2 config.bat menu-bar.el pc-win.el msdos.h
   rmail.el simple.el internal.el xfaces.c frame.c dosfns.c emacs.c
-  faces.el frame.el and 521 other files
+  faces.el frame.el and 522 other files
 
 Emanuele Giaquinta: changed rxvt.el configure.in etags.c frame.el
   sh-script.el text.texi
@@ -662,8 +666,8 @@ and changed mh-utils.el mh-e.el mh-comp.el mh-mime.el
 
 Eric Eide: changed gnus-xmas.el
 
-Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el delphi.el
-  dired.el emacsclient.c erc.el ispell.el make-dist
+Eric Hanchrow: changed TUTORIAL.es abbrev.el autorevert.el cperl-mode.el
+  delphi.el dired.el emacsclient.c erc.el ispell.el make-dist
 
 ,AI(Bric Jacoboni: changed fr-refcard.tex
 
@@ -729,7 +733,7 @@ Francesc Rocher: changed cus-start.el macterm.c w32term.c xdisp.c xterm.c
 
 Francesco Potort,Al(B: wrote cmacexp.el
 and changed etags.c man.el delta.h undigest.el comint.el configure.in
-  uniquify.el etags.1 latin-post.el rmail.el etags.el latin-alt.el
+  etags.1 uniquify.el latin-post.el rmail.el etags.el latin-alt.el
   sgml-mode.el Makefile.in data.c european.el filelock.c files.el
   generic-x.el gud.el hanoi.el and 42 other files
 
@@ -832,17 +836,16 @@ Germano Caronni: changed ralloc.c
 
 Gernot Heiser: changed refer.el
 
-Giorgos Keramidas: changed configure.in amdx86-64.h apropos.el
+Giorgos Keramidas: changed configure.in MACHINES amdx86-64.h apropos.el
   display.texi fringe.c fringe.el lisp.h windows.texi xmenu.c
 
-Giuseppe Scrivano: changed buffer.c configure configure.in sysdep.c
-  xsmfns.c
+Giuseppe Scrivano: changed buffer.c configure.in sysdep.c xsmfns.c
 
 Glenn Morris: changed f90.el calendar.el diary-lib.el fortran.el
   calendar.texi appt.el sh-script.el timeclock.el cal-menu.el Makefile.in
-  cal-hebrew.el cal-islam.el files.el holidays.el programs.texi
-  scroll-all.el startup.el abbrevs.texi cal-coptic.el cal-julian.el
-  cal-move.el and 59 other files
+  abbrevs.texi cal-hebrew.el cal-islam.el files.el holidays.el
+  programs.texi scroll-all.el startup.el cal-coptic.el cal-julian.el
+  cal-move.el and 76 other files
 
 Glynn Clements: wrote gamegrid.el snake.el tetris.el
 
@@ -867,6 +870,8 @@ Gregory Chernov: changed nnslashdot.el
 
 Gregory Neil Shapiro: changed mailabbrev.el
 
+Guanpeng Xu: changed add-log.el
+
 Guillermo J. Rozas: wrote fakemail.c
 
 Gunnar Horrigmo: changed gnus-sum.el
@@ -1017,9 +1022,9 @@ and changed bytecode.c mail-extr.el subr.el
 
 Jan Dj,Ad(Brv: wrote dnd.el x-dnd.el
 and changed gtkutil.c xterm.c xfns.c xmenu.c xterm.h configure.in
-  gtkutil.h x-win.el Makefile.in frames.texi keyboard.c config.in
-  configure xselect.c emacs.c alloc.c xlwmenu.c xresources.texi frame.c
-  startup.el xdisp.c and 175 other files
+  gtkutil.h x-win.el keyboard.c Makefile.in frames.texi config.in
+  xselect.c emacs.c alloc.c xlwmenu.c xresources.texi frame.c startup.el
+  xdisp.c cus-start.el and 176 other files
 
 Jan Nieuwenhuizen: changed info.el TUTORIAL.nl emacs.c emacsclient.c
   gnus-start.el gud.el nnmh.el server.el startup.el
@@ -1043,7 +1048,7 @@ Jason Rumney: wrote w32-vars.el
 and changed w32fns.c w32term.c w32menu.c w32-win.el w32term.h
   makefile.w32-in w32.c w32bdf.c w32-fns.el w32select.c w32console.c
   w32gui.h w32proc.c keyboard.c mule-cmds.el emacs.c fileio.c w32bdf.h
-  w32inevt.c config.nt configure.bat and 80 other files
+  w32inevt.c config.nt configure.bat and 82 other files
 
 Jay Belanger: changed calc.texi calc.el calc-ext.el calc-embed.el
   calc-aent.el calc-prog.el calc-arith.el calc-help.el calc-lang.el
@@ -1135,10 +1140,10 @@ Jochen Hein: changed gnus-art.el
 Jochen K,A|(Bpper: changed calc-units.el gnus.texi
 
 Joe Buehler: changed Makefile.in cygwin.h MACHINES browse-url.el
-  comint.el configure configure.in dired-aux.el dired.el dirtrack.el
-  dos-w32.el fast-lock.el filecache.el fileio.c files.el gmalloc.c
-  gnus-util.el hippie-exp.el keyboard.c lastfile.c loadup.el
-  and 12 other files
+  comint.el configure.in dired-aux.el dired.el dirtrack.el dos-w32.el
+  fast-lock.el filecache.el fileio.c files.el gmalloc.c gnus-util.el
+  hippie-exp.el keyboard.c lastfile.c loadup.el mem-limits.h
+  and 11 other files
 
 Joe Casadonte: changed gnus-srvr.el
 
@@ -1232,10 +1237,10 @@ Jonathan Stigelman: wrote hilit19.el
 
 Jonathan Vail: changed vc.el
 
-Jonathan Yavner: wrote tcover-ses.el tcover-unsafep.el
-and changed testcover.el Makefile.in files.el functions.texi
-  ses-example.ses ses.el ses.texi testcover-ses.el testcover-unsafep.el
-  unsafep.el variables.texi
+Jonathan Yavner: wrote ses.el tcover-ses.el tcover-unsafep.el
+  testcover.el unsafep.el
+and changed ses.texi Makefile.in edebug.el editfns.c files.el
+  functions.texi ses-example.ses subr.el variables.texi
 
 Jorgen Schaefer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el
 and changed erc.el erc-track.el erc-backend.el erc-match.el erc-stamp.el
@@ -1262,17 +1267,15 @@ Josh Huber: changed mml-sec.el gnus-msg.el message.el mml.el mml2015.el
 
 Joshua Varner: changed intro.texi
 
-Jouni K Seppanen: changed nnimap.el
-
-Jouni K. Sepp,Ad(Bnen: changed mm-url.el
+Jouni K. Sepp,Ad(Bnen: changed gnus.texi nnimap.el mm-url.el
 
 Juan Le,As(Bn Lahoz Garc,Am(Ba: wrote wdired.el
 and changed files.el perl-mode.el
 
-Juanma Barranquero: changed makefile.w32-in subr.el help-fns.el faces.el
-  files.el w32fns.c emacsclient.c replace.el bs.el buffer.c cperl-mode.el
-  eval.c org.el simple.el xdisp.c idlwave.el sh-script.el vhdl-mode.el
-  ada-mode.el allout.el comint.el and 619 other files
+Juanma Barranquero: changed makefile.w32-in subr.el help-fns.el files.el
+  faces.el w32fns.c emacsclient.c replace.el bs.el buffer.c cperl-mode.el
+  eval.c org.el simple.el vhdl-mode.el xdisp.c idlwave.el sh-script.el
+  window.c ada-mode.el allout.el and 622 other files
 
 Juergen Hoetzel: changed url-handlers.el
 
@@ -1293,8 +1296,8 @@ Juri Linkov: changed info.el simple.el isearch.el replace.el compile.el
 
 Justin Sheehy: changed gnus-sum.el nntp.el
 
-J,Ai(Br,At(Bme Marant: changed Makefile.in make-dist bindings.el configure
-  configure.in emacsclient.c misc.texi
+J,Ai(Br,At(Bme Marant: changed Makefile.in make-dist bindings.el configure.in
+  emacsclient.c misc.texi
 
 K. Shane Hartman: wrote chistory.el echistory.el electric.el emacsbug.el
   helper.el picture.el view.el
@@ -1353,7 +1356,7 @@ Katsumi Yamaoka: wrote canlock.el
 and changed gnus-art.el message.el gnus-sum.el gnus.texi mm-decode.el
   mm-view.el gnus-util.el mm-util.el gnus-msg.el gnus.el lpath.el
   gnus-group.el gnus-start.el rfc2047.el dgnushack.el mm-uu.el
-  gnus-agent.el mml.el nntp.el nnrss.el rfc2231.el and 72 other files
+  gnus-agent.el mml.el nnrss.el nntp.el rfc2231.el and 72 other files
 
 Kaveh R. Ghazi: changed delta88k.h xterm.c
 
@@ -1392,7 +1395,7 @@ Kenichi Handa: wrote cyrillic.el isearch-x.el py-punct.el pypunct-b5.el
 and changed coding.c mule-cmds.el mule.el charset.c fileio.c xterm.c
   fns.c ccl.c Makefile.in mule-conf.el fontset.c charset.h coding.h
   fontset.el mule-diag.el xdisp.c editfns.c process.c insdel.c
-  japanese.el characters.el and 278 other files
+  japanese.el characters.el and 279 other files
 
 Kenneth Stailey: changed alpha.h configure.in ns32000.h openbsd.h pmax.h
   sparc.h unexalpha.c unexelf.c
@@ -1422,24 +1425,25 @@ and changed gnus-agent.el gnus-start.el gnus-sum.el gnus-int.el gnus.el
 
 Kevin Layer: changed w32proc.c
 
-Kevin Rodgers: changed compile.el mailabbrev.el dired-x.el files.el
+Kevin Rodgers: changed compile.el files.el mailabbrev.el dired-x.el
   simple.el ange-ftp.el byte-opt.el desktop.el dired-x.texi ffap.el
-  files.texi flyspell.el isearch.el lisp.el loadhist.el mailalias.el
-  menu-bar.el print.c replace.el sendmail.el vc.el xfns.c
+  files.texi flyspell.el isearch.el killing.texi lisp.el loadhist.el
+  mailalias.el menu-bar.el print.c replace.el sendmail.el
+  and 5 other files
 
 Kevin Ryde: wrote info-xref.el
-and changed info-look.el info.el gnus-art.el gnus-sum.el mailcap.el
-  os.texi text.texi MORE.STUFF cc-align.el cmdargs.texi compile.texi
-  display.texi em-alias.el em-dirs.el em-hist.el em-unix.el
-  emacs-lisp-intro.texi etags.c ffap.el frames.texi glossary.texi
-  and 15 other files
+and changed info-look.el info.el cl.texi gnus-art.el gnus-sum.el
+  mailcap.el os.texi text.texi MORE.STUFF cal-dst.el calendar.texi
+  cc-align.el cmdargs.texi compile.texi display.texi em-alias.el
+  em-dirs.el em-hist.el em-unix.el emacs-lisp-intro.texi etags.c
+  and 18 other files
 
 Kim F. Storm: wrote bindat.el cua-base.el cua-gmrk.el cua-rect.el ido.el
   keypad.el kmacro.el
-and changed xdisp.c dispextern.h simple.el process.c window.c keyboard.c
+and changed xdisp.c dispextern.h simple.el window.c process.c keyboard.c
   xterm.c subr.el w32term.c dispnew.c lisp.h fringe.c macterm.c
   display.texi fns.c alloc.c xfaces.c xfns.c xterm.h .gdbinit info.el
-  and 243 other files
+  and 245 other files
 
 Kim-Minh Kaplan: changed gnus-picon.el gnus-sum.el gnus-start.el
   gnus-win.el gnus-xmas.el gnus.texi message.el nndraft.el nnml.el
@@ -1483,8 +1487,8 @@ Larry Kolodney: wrote cvtmail.c
 
 Lars Balker Rasmussen: changed gnus-art.el gnus-agent.el message.el
 
-Lars Brinkhoff: changed building.texi config.in configure configure.in
-  editfns.c fns.c os.texi
+Lars Brinkhoff: changed building.texi config.in configure.in editfns.c
+  fns.c os.texi
 
 Lars Hansen: changed desktop.el tramp.el info.el mh-e.el dired-x.el
   dired-x.texi dired.el ls-lisp.el rmail.el dired.c files.texi grp.h
@@ -1549,17 +1553,17 @@ and changed files.el autorevert.el cus-edit.el subr.el simple.el
   comint.el custom.texi emacs.texi fns.c frame.el ielm.el minibuf.texi
   modes.texi variables.texi buffers.texi and 215 other files
 
-$,1 a(Bukasz Demianiuk: changed erc.el
-
 Lucid, Inc.: changed byte-opt.el byte-run.el bytecode.c bytecomp.el
   delsel.el disass.el faces.el font-lock.el lmenu.el lselect.el
   mailabbrev.el select.el xfaces.c xselect.c
 
+$,1 a(Bukasz Demianiuk: changed erc.el
+
 Lute Kamstra: changed modes.texi generic.el debug.el generic-x.el
   font-lock.el subr.el Makefile.in debugging.texi easy-mmode.el
   elisp.texi hl-line.el simple.el battery.el bindings.el calc.el
   cmdargs.texi edebug.texi emacs.texi info.el make-tarball.txt
-  octave-inf.el and 217 other files
+  octave-inf.el and 216 other files
 
 Lynn Slater: wrote help-macro.el
 
@@ -1573,7 +1577,7 @@ and changed emacsclient.c emacsserver.c etags.c lisp.h movemail.c
 Maciek Pasternacki: changed nnrss.el
 
 Magnus Henoch: changed url-http.el ispell.el url.el url-gw.el
-  url-parse.el autoinsert.el rcirc.el url-https.el url-proxy.el
+  url-parse.el url-proxy.el autoinsert.el rcirc.el url-https.el
 
 Manuel Serrano: wrote flyspell.el
 
@@ -1620,7 +1624,8 @@ Mark D. Baushke: changed mh-e.el mh-utils.el mh-mime.el mh-comp.el
   mh-seq.el mh-speed.el mh-funcs.el mh-alias.el MH-E-NEWS etags.c
   mh-junk.el mh-pick.el mh-tool-bar.el mh-xemacs-compat.el
 
-Mark Davies: changed Makefile.in netbsd.h ralloc.c sort.el
+Mark Davies: changed Makefile.in amdx86-64.h configure configure.in
+  hp800.h netbsd.h ralloc.c sh3el.h sort.el
 
 Mark Diekhans: changed compile.el
 
@@ -1660,7 +1665,8 @@ and changed cus-edit.el Makefile.in files.el compile.el rmail.el
   mule-cmds.el rmailout.el checkdoc.el configure.in custom.el emacsbug.el
   gnus.el help-fns.el ls-lisp.el mwheel.el and 122 other files
 
-Markus Triska: changed doctor.el handwrite.el
+Markus Triska: changed doctor.el flymake.texi handwrite.el subr.el
+  tumme.el
 
 Marshall T. Vandegrift: changed gnus-fun.el
 
@@ -1680,9 +1686,9 @@ Martin Lorentzon: changed vc.el vc-cvs.el vc-hooks.el vc-rcs.el
 Martin Neitzel: changed sc.el
 
 Martin Rudalics: changed cus-edit.el wid-edit.el flyspell.el cus-start.el
-  files.el font-lock.el insdel.c macmenu.c syntax.c w32menu.c window.el
-  xdisp.c xmenu.c buffer.c buffer.h casefiddle.c cperl-mode.el custom.el
-  dispextern.h dnd.el editfns.c and 26 other files
+  files.el font-lock.el insdel.c macmenu.c syntax.c w32menu.c wdired.el
+  window.el xdisp.c xmenu.c buffer.c buffer.h casefiddle.c cperl-mode.el
+  custom.el dispextern.h dnd.el and 27 other files
 
 Martin Stjernholm: wrote cc-bytecomp.el
 and changed cc-engine.el cc-cmds.el cc-langs.el cc-defs.el cc-mode.el
@@ -1717,8 +1723,10 @@ Mathias Megyei: changed Makefile.in
 
 Mats Lidell: changed TUTORIAL.sv european.el gnus-art.el
 
-Matt Hodges: changed em-pred.el icon.el paragraphs.el simple.el table.el
-  telnet.el
+Matt Hodges: changed table.el faces.el iswitchb.el simple.el tmm.el
+  cal-menu.el calendar.el calendar.texi diary-lib.el easymenu.el
+  edebug.texi eldoc.el em-hist.el em-pred.el fixit.texi icon.el ido.el
+  locate.el paragraphs.el pcomplete.el repeat.el and 3 other files
 
 Matt Pharr: changed message.el
 
@@ -1747,7 +1755,7 @@ Michael Albinus: wrote tramp-ftp.el tramp-smb.el
 and changed tramp.el tramp.texi tramp-vc.el tramp-util.el ange-ftp.el
   files.el files.texi nnml.el tramp-uu.el vc.el dired-x.el dired.el
   faq.texi find-dired.el locate.el mini.texi rcompile.el tramp*.el
-  trampver.el woman.el
+  trampver.el trampver.texi woman.el
 
 Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h
   unexec.c
@@ -1785,11 +1793,11 @@ and changed ediff-merge.el ediff*.el viper*.el ediff-hooks.el menu-bar.el
   viper-utils.el appt.el desktop.el ediff-meta.el ediff-nult.el
   ediff.texi viper-mouse.el viper.texi
 
-Michael Olson: changed erc.el erc-backend.el Makefile erc.texi
+Michael Olson: changed erc.el erc-backend.el erc.texi Makefile
   erc-stamp.el erc-log.el erc-autoaway.el erc-identd.el erc-track.el
-  erc-match.el erc-dcc.el erc-list.el erc-notify.el erc-goodies.el
-  erc-ibuffer.el erc-nicklist.el erc-pcomplete.el erc-spelling.el
-  erc-bbdb.el erc-compat.el erc-fill.el and 42 other files
+  erc-list.el erc-match.el erc-dcc.el erc-notify.el erc-bbdb.el
+  erc-goodies.el erc-ibuffer.el erc-nicklist.el erc-pcomplete.el
+  erc-spelling.el erc-compat.el erc-fill.el and 43 other files
 
 Michael Piotrowski: changed gnus-sum.el ps-print.el
 
@@ -1819,10 +1827,10 @@ Michal Jankowski: changed insdel.c keyboard.c
 
 Michal Nazarewicz: changed ispell.el
 
-Micha,Ak(Bl Cadilhac: changed ido.el ispell.el anti.texi battery.el
-  blackbox.el cmuscheme.el cus-edit.el dispnew.c faq.texi flyspell.el
-  glasses.el info.el life.el lpr.el make-mode.el misc.texi pong.el
-  print.c process.c rect.el shell.el and 5 other files
+Micha,Ak(Bl Cadilhac: changed ido.el fill.el ispell.el anti.texi battery.el
+  blackbox.el bs.el cmuscheme.el cus-edit.el dispnew.c faq.texi
+  flyspell.el footnote.el glasses.el info.el life.el lpr.el make-mode.el
+  misc.texi pong.el print.c and 8 other files
 
 Michelangelo Grigni: wrote ffap.el
 and changed gnus-score.el
@@ -1856,7 +1864,7 @@ Miles Bader: wrote button.el image-file.el macroexp.el minibuf-eldef.el
   rfn-eshadow.el
 and changed comint.el faces.el simple.el editfns.c xfaces.c info.el
   xdisp.c minibuf.c wid-edit.el xterm.c subr.el window.el cus-edit.el
-  diff-mode.el dispextern.h xfns.c help.el lisp.h quick-install-emacs
+  diff-mode.el dispextern.h quick-install-emacs xfns.c help.el lisp.h
   textprop.c menu-bar.el and 240 other files
 
 Miyashita Hisashi: changed ccl.c coding.c coding.h mule-cmds.el
@@ -1889,7 +1897,7 @@ Nachum Dershowitz: wrote cal-hebrew.el
 Nagy Andras: wrote gnus-sieve.el
 and changed imap.el gnus.el
 
-Nakaji Hiroyuki: changed amdx86-64.h configure configure.in mm-util.el
+Nakaji Hiroyuki: changed amdx86-64.h configure.in mm-util.el
 
 Nakamura Toshikazu: changed w32fns.c
 
@@ -1912,9 +1920,9 @@ Niall Mansfield: changed etags.c
 
 Nick Roberts: wrote gdb-ui.el
 and changed gud.el building.texi tooltip.el speedbar.el bindings.el
-  thumbs.el DEBUG cc-mode.el frames.texi subr.el xt-mouse.el .gdbinit
-  comint.el display.texi help-mode.el descr-text.el gud-display.pbm
-  speedbar.texi tumme.el xdisp.c byte-run.el and 113 other files
+  thumbs.el DEBUG cc-mode.el .gdbinit frames.texi subr.el xt-mouse.el
+  comint.el display.texi help-mode.el descr-text.el dired.el
+  gud-display.pbm speedbar.texi t-mouse.el tumme.el and 114 other files
 
 Nico Francois: changed w32fns.c w32inevt.c w32menu.c
 
@@ -2144,11 +2152,11 @@ and changed gnus-art.el gnus-msg.el gnus.texi message.el nnmail.el
   pgg-gpg.el
 
 Reiner Steib: wrote gmm-utils.el
-and changed gnus-art.el message.el gnus.texi gnus-sum.el gnus.el
+and changed gnus-art.el gnus.texi message.el gnus-sum.el gnus.el
   gnus-group.el gnus-faq.texi gnus-util.el mml.el gnus-start.el
-  mm-util.el gnus-agent.el gnus-msg.el gnus-score.el message.texi
-  files.el spam-report.el mm-decode.el nnweb.el spam.el deuglify.el
-  and 163 other files
+  message.texi mm-util.el gnus-agent.el gnus-msg.el gnus-score.el spam.el
+  files.el spam-report.el mm-decode.el nnweb.el deuglify.el
+  and 164 other files
 
 Remek Trzaska: changed gnus-ems.el
 
@@ -2213,7 +2221,7 @@ and changed texinfmt.el emacs-lisp-intro.texi page-ext.el emacs.tex
   cl.texinfo history.el informat.el latin-1.el latin-2.el latin-3.el
   latin-4.el page.el tex-mode.el texinfo.texinfo vip.texinfo
 
-Robert Thorpe: changed cus-start.el
+Robert Thorpe: changed cus-start.el indent.el
 
 Roberto Rodr,Am(Bguez: changed ada-mode.texi glossary.texi widget.texi
 
@@ -2246,7 +2254,7 @@ Romain Francoise: changed faq.texi dired-x.el ibuf-ext.el Makefile.in
   compile.el message.el puresize.h replace.el subr.el comint.el
   files.texi gnus-fun.el gnus.texi help-fns.el make-dist rcirc.el
   antlr-mode.el bookmark.el buffer.c diary-lib.el dired.el
-  and 126 other files
+  and 128 other files
 
 Roman Belenov: changed which-func.el
 
@@ -2397,6 +2405,10 @@ Stephen A. Wood: changed fortran.el
 
 Stephen Berman: changed allout.el
 
+Stephen C. Gilardi: changed configure.in
+
+Stephen Compall: changed saveplace.el texinfo.el
+
 Stephen Eglen: wrote iswitchb.el mspools.el
 and changed diary-lib.el locate.el octave-inf.el replace.el hexl.el
   info-look.el sendmail.el spell.el uce.el MORE.STUFF add-log.el
@@ -2411,7 +2423,7 @@ and changed time-stamp.el mh-e.el mh-comp.el mh-utils.el mh-customize.el
 Stephen J. Turnbull: changed ediff-init.el strings.texi subr.el
 
 Stephen Leake: changed ada-mode.el ada-xref.el ada-stmt.el ada-mode.texi
-  ada-prj.el
+  ada-prj.el align.el
 
 Steve Fisk: wrote cal-tex.el
 
@@ -2437,9 +2449,9 @@ and changed gnus-xmas.el gnus-msg.el add-log.el dgnushack.el edebug.el
 Steven Suhr: changed dispnew.c scroll.c term.c termchar.h
 
 Steven Tamm: changed macterm.c make-package mac.c macfns.c configure.in
-  unexmacosx.c INSTALL configure mac-win.el Makefile.in README darwin.h
-  editfns.c lread.c macmenu.c scroll-bar.el MACHINES config.h config.in
-  dispnew.c eval.c and 8 other files
+  unexmacosx.c INSTALL mac-win.el Makefile.in README darwin.h editfns.c
+  lread.c macmenu.c scroll-bar.el MACHINES config.h config.in dispnew.c
+  eval.c fileio.c and 7 other files
 
 Stewart M. Clamen: wrote cal-mayan.el
 
@@ -2505,7 +2517,7 @@ Thien-Thi Nguyen: wrote hideshow.el make-mms-derivative.el
 and changed ewoc.el info.el processes.texi zone.el Makefile.in vc.el
   fileio.c lisp-mode.el scheme.el text.texi bindat.el dcl-mode.el
   display.texi files.el pcvs.el sysdep.c MORE.STUFF TUTORIAL.it
-  TUTORIAL.ja diary-lib.el diff-mode.el and 125 other files
+  TUTORIAL.ja diary-lib.el diff-mode.el and 124 other files
 
 Thierry Emery: changed kinsoku.el timezone.el url-http.el wid-edit.el
 
@@ -2627,7 +2639,8 @@ Vinicius Jose Latorre: wrote delim-col.el ebnf-abn.el ebnf-bnf.el
   ebnf-dtd.el ebnf-ebx.el ebnf-iso.el ebnf-otz.el ebnf-yac.el ebnf2ps.el
   printing.el ps-mule.el
 and changed ps-print.el ps-prin1.ps ps-bdf.el ps-prin0.ps ps-prin3.ps
-  ps-prin2.ps lpr.el subr.el ps-print-def.el ps-print0.ps ps-vars.el
+  ps-prin2.ps lpr.el subr.el easymenu.el ps-print-def.el ps-print0.ps
+  ps-vars.el
 
 Vivek Dasmohapatra: changed emacs.c sh-script.el xterm.c xterm.h
 
@@ -2695,9 +2708,9 @@ Xavier Maillard: changed gnus-faq.texi gnus-score.el spam.el
 Yagi Tatsuya: changed gnus-art.el gnus-start.el
 
 Yamamoto Mitsuharu: changed macterm.c macfns.c mac-win.el mac.c macterm.h
-  macgui.h macmenu.c image.c macselect.c keyboard.c xdisp.c emacs.c
+  macmenu.c macgui.h image.c macselect.c keyboard.c xdisp.c emacs.c
   makefile.MPW config.h macos.texi xfaces.c INSTALL Makefile.in darwin.h
-  configure configure.in and 71 other files
+  configure.in dispextern.h and 70 other files
 
 Yann Dirson: changed imenu.el
 
diff --git a/ChangeLog b/ChangeLog
index 32b12e6d1c8..570441ec519 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* configure.in: Remove support for hp800 and sr2k machine types.
+
+	* configure: Regenerate.
+
+2007-01-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* configure.in: Add check for libXft.
+
+2007-01-18  Bruno Haible  <bruno@clisp.org> (tiny change)
+
+	* INSTALL: Info files moved to share/info.
+
 2007-01-02  Stephen C. Gilardi  <scgilardi@gmail.com>  (tiny change)
 
 	* configure.in: Detect and use fink-installed in intel-based Mac
@@ -6370,7 +6384,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-	2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+	2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/INSTALL b/INSTALL
index be3dde42f12..3bcce41877d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 GNU Emacs Installation Guide
-Copyright (c) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-2005, 2006  Free Software Foundation, Inc.
+Copyright (C) 1992, 1994, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007  Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 
@@ -504,10 +504,11 @@ are installed in the following directories:
 		useful for sites at which different kinds of machines
 		share the file system Emacs is installed on.
 
-`/usr/local/info' holds the on-line documentation for Emacs, known as
-		"info files".  Many other GNU programs are documented
-		using info files as well, so this directory stands
-		apart from the other, Emacs-specific directories.
+`/usr/local/share/info' holds the on-line documentation for Emacs,
+		known as "info files".  Many other GNU programs are
+		documented using info files as well, so this directory
+		stands apart from the other, Emacs-specific
+		directories.
 
 `/usr/local/man/man1' holds the man pages for the programs installed
 		in `/usr/local/bin'.
@@ -533,8 +534,8 @@ the command.  See the section below called `MAKE VARIABLES' for more
 information on this.
 
 8) Check the file `dir' in your site's info directory (usually
-/usr/local/info) to make sure that it has a menu entry for the Emacs
-info files.
+/usr/local/share/info) to make sure that it has a menu entry for the
+Emacs info files.
 
 9) If your system uses lock files to interlock access to mailer inbox files,
 then you might need to make the movemail program setuid or setgid
@@ -600,7 +601,7 @@ Here is a complete list of the variables you may want to set.
 	installed on.
 
 `infodir' indicates where to put the info files distributed with
-	Emacs; it defaults to `/usr/local/info'.
+	Emacs; it defaults to `/usr/local/share/info'.
 
 `mandir' indicates where to put the man pages for Emacs and its
 	utilities (like `etags'); it defaults to
diff --git a/Makefile.in b/Makefile.in
index 54c55ea9f62..b354177d0b9 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -3,7 +3,7 @@
 # DIST: that first.
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/admin/ChangeLog b/admin/ChangeLog
index 65606c02cb5..f675cdbb4e5 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-27  Jan Dj,AC$(Brv  <jhd@winter.localdomain>
+
+	* FOR-RELEASE: Removed Gtk/Xft issue.
+
 2007-01-01  Miles Bader  <miles@gnu.org>
 
 	* quick-install-emacs (get_config_var): Deal with weird magic
@@ -405,8 +409,8 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-	Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index 64163176bbb..a03ea3c83db 100644
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -1,7 +1,11 @@
 Tasks needed before the next release.
 
 * UPDATE COPYRIGHTS (Happy New Year :-)
+  Done, I think. Please keep an eye out for any errors, eg copyrights
+  not at the start of the file that are easy to miss, as in
+  src/emacs.c.
 
+  See also the oustanding issues in admin/notes/copyright.
 
 * TO BE DONE SHORTLY BEFORE RELEASE
 
@@ -29,6 +33,10 @@ sk	Miroslav Vaško        No response
 
 Reminders sent out on 2006-06-08.
 
+Note: regardless of the above, the following files need to be
+regenerated to get updated copyright notices: sk-refcard.ps,
+pl-refcard.ps, cs-refcard.ps.
+
 ** Send an email to the various distributions, including the GNOME
 and KDE projects, to use the new Emacs icons in etc/images/icons.
 
@@ -50,29 +58,13 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 * BUGS
 
-** Need papers from Rubini for his code in t-mouse.el
-  Sent instructions.
-
-** lennart.borgman.073@student.lu.se, Dec 21:
-  Saving when the coding system can't code all buffer characters
-
-** Bug in ESHELL that Wiegley is supposed to fix.
-
-** How should C-x C-v ask about saving?
-
-** lennart.borgman.073@student.lu.se, Dec 16:
-  compilation-previous-error fails if first error is at start of buffer
-
 ** W3 status with latest url package.
 
 ** Fix up the notices in oldXMenu properly.
 
-** bruno@clisp.org's patches for location of Info file directory.
-
 ** disumu@x3y2z1.net, Nov 22:
   URL not following some 302 redirects after recent changes
 
-** storm@cua.dk, Jan 2: Bug in incremental undrawing of mouseover highlighting
 ** lennart.borgman.073@student.lu.se, Dec 29:
   How global is a define-global-minor-mode mode
 He says that customizing such a mode simply does not work.
@@ -80,20 +72,15 @@ RMS says that there is no code in the generated defcustom,
 or elsewhere in the generated code, to implement setting that variable
 through the custom mechanism.
 
-** b.riefenstahl@turtle-trading.net, Dec 29:
-  GTK build crashes under X
-
-** dooglus@gmail.com, Dec 29: 4 week-old pretest bugs
-  Two GTK version bugs.
-
-** jpff@cs.bath.ac.uk, Jan 5: Failure to submit second netnews message
+** simon.marshall@misys.com, Jan 12: 
+  Font-lock decides function call is function declaration in C+ +
 
-** KSNetz@UseNet.ArcorNews.DE, Jan 5: 
-    url-http.el: calling the callback function for proxy connections
+** ZTHJWSQQAFHV@spammotel.com, Jan 12:
+  Color-theme problems in Emacs 22+ (Ubuntu, Windows)
 
-** simon.marshall@misys.com, Jan 9: Possible mouse-face redisplay glitch
+** jka-compr fails when default-directory is nonexistent.
 
-** dooglus@gmail.com, Jan 10: problem with transparent PNG image display
+** Binding print-circle to nil in compilation for certain files.
 
 * DOCUMENTATION
 
diff --git a/admin/admin.el b/admin/admin.el
index c2d4eebe903..342b40f9bde 100644
--- a/admin/admin.el
+++ b/admin/admin.el
@@ -1,7 +1,7 @@
 ;;; admin.el --- utilities for Emacs administration
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 3ca8d4349f3..c336d808d58 100644
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,6 +1,6 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-     Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/admin/build-configs b/admin/build-configs
index b3bbfda0cd2..b99b5405075 100755
--- a/admin/build-configs
+++ b/admin/build-configs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/cus-test.el b/admin/cus-test.el
index 57e98b6f323..cba8e31ac89 100644
--- a/admin/cus-test.el
+++ b/admin/cus-test.el
@@ -1,7 +1,7 @@
 ;;; cus-test.el --- tests for custom types and load problems
 
-;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006  Free
-;;   Software Foundation, Inc.
+;; Copyright (C) 1998, 2000, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Markus Rost <markus.rost@mathematik.uni-regensburg.de>
 ;; Maintainer: Markus Rost <rost@math.ohio-state.edu>
diff --git a/admin/diff-tar-files b/admin/diff-tar-files
index c27a8df991d..03b5a00a12f 100755
--- a/admin/diff-tar-files
+++ b/admin/diff-tar-files
@@ -1,7 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/make-emacs b/admin/make-emacs
index 01b8bddbd78..d6b14ca22b9 100755
--- a/admin/make-emacs
+++ b/admin/make-emacs
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/admin/notes/copyright b/admin/notes/copyright
new file mode 100644
index 00000000000..0c2340fc54f
--- /dev/null
+++ b/admin/notes/copyright
@@ -0,0 +1,205 @@
+NOTES ON COPYRIGHTS AND LICENSES
+
+Some terminology:
+
+A "copyright notice" consists of one or a few lines of this format:
+"Copyright (C) 2006, 2007 Free Software Foundation, Inc."
+
+A "license notice" is a statement of permissions, and is usually much
+longer, eg the text "GNU Emacs is free software...".
+
+
+Every non-trivial file distributed through the Emacs CVS should be
+self-explanatory in terms of copyright and license. This includes
+files that are not distributed in Emacs releases (for example, the
+admin/ directory), because the whole Emacs CVS is publicly
+available.
+
+The definition of triviality is a little vague, but a rule of thumb is
+that any file with less than 15 lines of actual content is trivial. If
+a file is auto-generated (eg ldefs-boot.el) from another one in the
+CVS, then it does not really matter about adding a copyright statement
+to the generated file.
+
+The years in the copyright notice should be updated every year (see
+file "years" in this directory). The PS versions of refcards etc
+should display copyright notices (an exception to the rule about
+"generated" files), but these can just display the latest year. The
+full list of years should be kept in comments in the source file. If
+these are distributed in CVS, check in a regenerated version when the
+tex files are updated.
+
+Copyright changes should be propagated to any associated repositories
+(eg Gnus, MH-E), but I think in every case this happens automatically
+(?).
+
+All README (and other such text files) that are non-trivial and were
+added by Emacs developers need copyright and copying permission
+statements (see eg INSTALL in the top-level directory).
+
+All images files that allow for comments should have copyright and
+license statements. Whether or not this is possible, the information
+should be recorded in a README file in each directory with images.
+
+When installing a file with an "unusual" license (after checking first
+it is ok), put a copy of the copyright and license in the file (if
+possible. It's ok if this makes the file incompatible with its
+original format, if it can still be used by Emacs), or in a README
+file in the relevant directory.
+
+The vast majority of files are copyright FSF and distributed under the
+GPL. A few files (mainly related to language and charset support) are
+copyright AIST alone, or both AIST and FSF. (Contact Kenichi Handa
+with questions about legal issues in such files.) In all these cases,
+the copyright years in each file should be updated each year.
+
+There are some exceptions to the points in the previous paragraph, and
+these are listed below for reference, together with any files where
+the copyright needs to be updated in "unusual" ways.
+
+If you find any other such cases, please consult to check they are ok,
+and note them in this file. This includes missing copyright notices,
+and "odd" copyright holders. In most cases, individual authors should
+not appear in copyright statements. Either the copyright has been
+assigned (check copyright.list) to the FSF (in which case the original
+author should be removed and the year(s) transferred to the FSF); or
+else it is possible the file should not be in Emacs at all (please
+report!).
+
+[For reference, most of these points were established via email with
+rms, 2007/1, "Copyright years".]
+
+
+<top-level>/install-sh
+lispintro/install-sh
+ - this file is copyright MIT, which is OK. Leave the copyright alone.
+
+etc/edt-user.doc
+  - update BOTH notices in this file
+
+leim/CXTERM-DIC/4Corner.tit, ARRAY30.tit, [CCDOSPY.tit], ECDICT.tit,
+ETZY.tit, [PY-b5.tit], Punct-b5.tit, Punct.tit, QJ-b5.tit, QJ.tit,
+[SW.tit, TONEPY.tit,] ZOZY.tit
+  - leave the copyrights alone.
+
+leim/MISC-DIC/CTLau-b5.html, CTLau.html, cangjie-table.b5, cangjie-table.cns,
+[pinyin.map, ziranma.cin]
+  - leave the copyright alone.
+
+leim/SKK-DIC/SKK-JISYO.L
+ja-dic/ja-dic.el
+  (the latter is auto-generated from the former). Leave the copyright alone.
+
+lib-src/etags.c
+  - this has a copyright Ken Arnold. We are still deciding what should
+  be done here (see below).
+
+lib-src/getopt1.c, getopt_int.h
+  - these are from the GNU C library. Leave the copyrights alone.
+
+lispref/doclicense.texi
+man/doclicense.texi
+  - leave the copyright alone in this imported file.
+
+lisp/net/tramp.el
+  - there are also copyrights in the body of the file. Update these too.
+
+msdos/is_exec.c, sigaction.c
+  - these files are copyright DJ Delorie. Leave the copyrights alone.
+
+src/gmalloc.c
+   - contains numerous copyrights from the GNU C library. Leave them alone.
+
+
+*** These are copyright issues still to be addressed:
+
+
+All README (and other such files) that are non-trivial and were added
+by Emacs developers need copyright statements and copying permissions
+to be added.
+
+
+All images files that allow for comments should have copyright and
+license statements added. Whether or not this is possible, the
+information should be recorded in a README file in each directory with
+images.
+
+
+admin/check-doc-strings
+  Author is Martin Buchholz, but no assignment from him on file, and
+  rms has no way to reach him.
+admin/make-announcement - no copyright
+admin/nt/makedist.bat - no copyright
+etc/ms-kermit - no copyright, but ms-7bkermit has one
+etc/e/eterm-color.ti  - no copyright
+  rms: "I think that is not copyrightable under the merger doctrine
+  because the entries are all forced. At least that is the case in the
+  US; I am not sure whether we can rely on that in general."
+
+For the above files, mail sent froam rms to Matthew (Martin?) Norwood
+asking what to do (via Eben Moglen), 2007/1/22 ("Copyright years").
+
+
+etc/gnus-refcard.tex
+  I (rgm) think the "Gnus Bugfixing Girls + Boys" copyright should
+  probably be removed, but it may be ok (waiting for rms)
+
+
+etc/orgcard.tex - no Rooke in copyright.list
+ rms will talk with Org mode author about this.
+
+
+etc/sk-refcard.ps, pl-refcard.ps, cs-refcard.ps
+These refcards need to be regenerated (by those with suitable TeX
+setups) to get updated copyrights.
+
+
+leim/CXTERM-DIC/CCDOSPY.tit, PY-b5.tit, SW.tit, TONEPY.tit
+leim/MISC-DIC/pinyin.map, ziranma.cin
+ The copyright and license is stated in the README file, but we may as
+ well copy them into the files themselves (possibly at the expense of
+ making them incompatible with their original formats, but they will
+ still be usable by Emacs). [Kenichi Handa]
+
+
+lib-src/etags.c - no 'k.* arnold' in copyright.list'
+ rms: "That is ok, in principle. I used free code released by Ken
+ Arnold as the starting point. However, it may be that we need to get
+ and insert whatever his license was for his code."
+
+
+lispref/back.texi, elisp-covers.texi, lay-flat.texi,
+two-volume-cross-refs.txt, two.el
+  - add standard notices to any decided to be non-trivial.
+
+
+lwlib/lwlib-int.h, lwlib.h - no copyright
+lwlib/Makefile.in, lwlib-utils.c, lwlib.c - copyright Lucid
+lwlib/lwlib-Xaw.c - copyright Chuck Thompson
+lwlib/lwlib.c - copyright Lucid, but FSF copyright was added in 2002 -
+   was that correct?
+  rms: "I asked Matthew Norwood about these, I believe."
+
+
+man/back.texi, trampver.texi
+  - add standard notices to any decided to be non-trivial.
+
+
+msdos/
+  - do we need to add COPYING.LIB (because COPYING.DJ refers to it)?
+
+
+oldXMenu/
+ - should there be any FSF copyrights at all in here? Some were added
+   in 2005, without licence notices. Was this right?
+oldXMenu/Makefile.in, Makefile, Imakefile, descrip.mms, insque.c
+  - issues described in mail to rms, 2006/12/17.
+rms: "I have asked for lawyer's advice about these."
+
+
+src/acldef.h, chpdef.h, gnu.h, ndir.h
+src/m/mips4.h, news-r6.h, news-risc.h, pmax.h
+src/s/aix3-2.h, bsd386.h, hpux8.h, hpux9.h, irix4-0.h, irix5-0.h,
+isc2-2.h, netbsd.h, osf1.h, sol2-3.h, sunos4-0.h, umips.h, usg5-4-2.h
+  - all these (not obviously trivial) files are missing copyrights.
+  rms: "I should talk about these with Matthew Norwood."
diff --git a/admin/notes/years b/admin/notes/years
index 155ccd6f065..fe08fa9640a 100644
--- a/admin/notes/years
+++ b/admin/notes/years
@@ -1,8 +1,8 @@
 How to Maintain Copyright Years for GNU Emacs
-
+  (see also file "copyright" in this directory)
 
 "Our lawyer says it is ok if we add, to each file that has been in Emacs
- since Emacs 21 came out in 2001, all the subsequent years.  We don't
+ since Emacs 21 came out in 2001, all the subsequent years[1].  We don't
  need to check whether *that file* was changed in those years.
  It's sufficient that *Emacs* was changed in those years (and it was!).
 
@@ -11,13 +11,15 @@ How to Maintain Copyright Years for GNU Emacs
 
  --RMS, 2005-07-13
 
+[1] Note that this includes 2001 - see
+<http://lists.gnu.org/archive/html/emacs-pretest-bug/2006-12/msg00119.html>
+
 
 For the refcards under etc/, it's ok to simply use the latest year
 (typically in a `\def\year{YEAR}' expression) for the rendered copyright
 notice, while maintaining the full list of years in the copyright notice
 in the comments.
 
-
 ------------------------------------------------------------------------------
 
 
diff --git a/admin/quick-install-emacs b/admin/quick-install-emacs
index 2167b8ee2d1..a6e70120e6d 100755
--- a/admin/quick-install-emacs
+++ b/admin/quick-install-emacs
@@ -1,9 +1,33 @@
 #!/bin/sh
-# quick-install-emacs -- do a halfway-decent job of installing emacs quickly
-# Written by Miles Bader <miles@gnu.org>
+### quick-install-emacs --- do a halfway-decent job of installing emacs quickly
+
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## Author: Miles Bader <miles@gnu.org>
+
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## GNU Emacs is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+### Commentary:
+
+## This script is mainly intended for emacs maintainer or pretesters who
+## install emacs very often.  See the --help output for more details.
 
-# This script is mainly intended for emacs maintainer or pretesters who
-# install emacs very often.  See the --help output for more details.
 
 PUBLIC_LIBSRC_BINARIES='b2m emacsclient etags ctags ebrowse'
 PUBLIC_LIBSRC_SCRIPTS='grep-changelog rcs-checkin'
diff --git a/admin/revdiff b/admin/revdiff
index 9d419cdbfdb..78be1f62304 100755
--- a/admin/revdiff
+++ b/admin/revdiff
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-#   Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/config.bat b/config.bat
index 966b36d59ed..9e56b782256 100644
--- a/config.bat
+++ b/config.bat
@@ -2,7 +2,7 @@
 rem   ----------------------------------------------------------------------

 rem   Configuration script for MSDOS

 rem   Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003

-rem   2004, 2005, 2006  Free Software Foundation, Inc.

+rem   2004, 2005, 2006, 2007  Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

diff --git a/config.guess b/config.guess
index 862b408779a..2f832fdeab7 100755
--- a/config.guess
+++ b/config.guess
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 timestamp='2006-04-20'
 
diff --git a/config.sub b/config.sub
index 5b41640064e..9e600e0a669 100755
--- a/config.sub
+++ b/config.sub
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 timestamp='2006-04-20'
 
diff --git a/configure b/configure
index a616aacf1e9..5b8fe560532 100755
--- a/configure
+++ b/configure
@@ -689,6 +689,8 @@ SET_MAKE
 XMKMF
 GTK_CFLAGS
 GTK_LIBS
+XFT_CFLAGS
+XFT_LIBS
 ALLOCA
 liblockfile
 LIBOBJS
@@ -2233,7 +2235,6 @@ _ACEOF
       vax-*-netbsd*)	machine=vax ;;
       arm-*-netbsd*)	machine=arm ;;
       x86_64-*-netbsd*)	machine=amdx86-64 ;;
-      hppa-*-netbsd*)	machine=hp800 ;;
       shle-*-netbsd*)	machine=sh3el ;;
     esac
   ;;
@@ -2342,6 +2343,24 @@ _ACEOF
     machine=apollo opsys=bsd4-3
   ;;
 
+  ## Apple Darwin / Mac OS X
+  *-apple-darwin* )
+    case "${canonical}" in
+      i[3456]86-* )  machine=intel386 ;;
+      powerpc-* )    machine=powermac ;;
+      * )            unported=yes ;;
+    esac
+    opsys=darwin
+    # Define CPP as follows to make autoconf work correctly.
+    CPP="${CC-cc} -E -no-cpp-precomp"
+    # Use fink packages if available.
+    if test -d /sw/include && test -d /sw/lib; then
+      GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
+      CPP="${CPP} ${GCC_TEST_OPTIONS}"
+      NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
+    fi
+  ;;
+
   ## AT&T 3b2, 3b5, 3b15, 3b20
   we32k-att-sysv* )
     machine=att3b opsys=usg5-2-2
@@ -2531,13 +2550,6 @@ _ACEOF
     machine=nh6000 opsys=powerunix
     NON_GNU_CPP="cc -Xo -E -P"
   ;;
-  ## SR2001/SR2201 running HI-UX/MPP
-  hppa1.1-hitachi-hiuxmpp* )
-    machine=sr2k opsys=hiuxmpp
-  ;;
-  hppa1.1-hitachi-hiuxwe2* )
-    machine=sr2k opsys=hiuxwe2
-  ;;
   ## Honeywell XPS100
   xps*-honeywell-sysv* )
     machine=xps100 opsys=usg5-2
@@ -2560,50 +2572,6 @@ _ACEOF
     esac
   ;;
 
-  ## HP 9000 series 700 and 800, running HP/UX
-  hppa*-hp-hpux7* )
-    machine=hp800 opsys=hpux
-  ;;
-  hppa*-hp-hpux8* )
-    machine=hp800 opsys=hpux8
-  ;;
-  hppa*-hp-hpux9shr* )
-    machine=hp800 opsys=hpux9shr
-  ;;
-  hppa*-hp-hpux9* )
-    machine=hp800 opsys=hpux9
-  ;;
-  hppa*-hp-hpux10.2* )
-    machine=hp800 opsys=hpux10-20
-  ;;
-  hppa*-hp-hpux10* )
-    machine=hp800 opsys=hpux10
-  ;;
-  hppa*-hp-hpux1[1-9]* )
-    machine=hp800 opsys=hpux11
-    CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
-  ;;
-
-  hppa*-*-linux-gnu* )
-    machine=hp800 opsys=gnu-linux
-  ;;
-
-  ## HP 9000 series 700 and 800, running HP/UX
-  hppa*-hp-hpux* )
-    ## Cross-compilation?  Nah!
-    case "`uname -r`" in
-      ## Someone's system reports A.B8.05 for this.
-      ## I wonder what other possibilities there are.
-      *.B8.* ) machine=hp800 opsys=hpux8 ;;
-      *.08.* ) machine=hp800 opsys=hpux8 ;;
-      *.09.* ) machine=hp800 opsys=hpux9 ;;
-      *) machine=hp800 opsys=hpux10 ;;
-    esac
-  ;;
-  hppa*-*-nextstep* )
-    machine=hp800 opsys=nextstep
-  ;;
-
   ## Orion machines
   orion-orion-bsd* )
     machine=orion opsys=bsd4-2
@@ -3118,19 +3086,6 @@ _ACEOF
     machine=f301 opsys=uxpv
   ;;
 
-  ## Darwin / Mac OS X
-  powerpc-apple-darwin* )
-    machine=powermac opsys=darwin
-    # Define CPP as follows to make autoconf work correctly.
-    CPP="${CC-cc} -E -no-cpp-precomp"
-    # Use fink packages if available.
-    if test -d /sw/include && test -d /sw/lib; then
-	GCC_TEST_OPTIONS="-I/sw/include -L/sw/lib"
-        CPP="${CPP} ${GCC_TEST_OPTIONS}"
-	NON_GCC_TEST_OPTIONS=${GCC_TEST_OPTIONS}
-    fi
-  ;;
-
   ## AMD x86-64 Linux-based GNU system
   x86_64-*-linux-gnu* )
     machine=amdx86-64 opsys=gnu-linux
@@ -11565,6 +11520,327 @@ _ACEOF
   fi
 fi
 
+### Link with -lXft if available to work around a bug.
+HAVE_XFT=maybe
+if test "${HAVE_GTK}" = "yes"; then
+    if test "X${with_pkg_config_prog}" != X; then
+    PKG_CONFIG="${with_pkg_config_prog}"
+  fi
+
+
+  succeeded=no
+
+  if test -z "$PKG_CONFIG"; then
+    # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+IFS=$as_save_IFS
+
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+echo "${ECHO_T}$PKG_CONFIG" >&6; }
+else
+  { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+  fi
+
+  if test "$PKG_CONFIG" = "no" ; then
+     HAVE_XFT=no
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { echo "$as_me:$LINENO: checking for xft >= 0.13.0" >&5
+echo $ECHO_N "checking for xft >= 0.13.0... $ECHO_C" >&6; }
+
+        if $PKG_CONFIG --exists "xft >= 0.13.0" 2>&5; then
+            { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+            succeeded=yes
+
+            { echo "$as_me:$LINENO: checking XFT_CFLAGS" >&5
+echo $ECHO_N "checking XFT_CFLAGS... $ECHO_C" >&6; }
+            XFT_CFLAGS=`$PKG_CONFIG --cflags "xft >= 0.13.0"`
+            { echo "$as_me:$LINENO: result: $XFT_CFLAGS" >&5
+echo "${ECHO_T}$XFT_CFLAGS" >&6; }
+
+            { echo "$as_me:$LINENO: checking XFT_LIBS" >&5
+echo $ECHO_N "checking XFT_LIBS... $ECHO_C" >&6; }
+            XFT_LIBS=`$PKG_CONFIG --libs "xft >= 0.13.0"`
+            { echo "$as_me:$LINENO: result: $XFT_LIBS" >&5
+echo "${ECHO_T}$XFT_LIBS" >&6; }
+        else
+            { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+            XFT_CFLAGS=""
+            XFT_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            XFT_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "xft >= 0.13.0"`
+
+        fi
+
+
+
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+
+  if test $succeeded = yes; then
+     :
+  else
+     HAVE_XFT=no
+  fi
+
+  if test "$HAVE_XFT" != no; then
+    OLD_CFLAGS="$CPPFLAGS"
+    OLD_CFLAGS="$CFLAGS"
+    OLD_LIBS="$LIBS"
+    CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+    CFLAGS="$CFLAGS $XFT_CFLAGS"
+    LIBS="$XFT_LIBS $LIBS"
+    if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+  { echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+else
+  # Is the header compilable?
+{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h usability" >&5
+echo $ECHO_N "checking X11/Xft/Xft.h usability... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+$ac_includes_default
+#include <X11/Xft/Xft.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_compile") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest.$ac_objext; then
+  ac_header_compiler=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_header_compiler=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6; }
+
+# Is the header present?
+{ echo "$as_me:$LINENO: checking X11/Xft/Xft.h presence" >&5
+echo $ECHO_N "checking X11/Xft/Xft.h presence... $ECHO_C" >&6; }
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+#include <X11/Xft/Xft.h>
+_ACEOF
+if { (ac_try="$ac_cpp conftest.$ac_ext"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null && {
+	 test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       }; then
+  ac_header_preproc=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+  ac_header_preproc=no
+fi
+
+rm -f conftest.err conftest.$ac_ext
+{ echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6; }
+
+# So?  What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+  yes:no: )
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the compiler's result" >&2;}
+    ac_header_preproc=yes
+    ;;
+  no:yes:* )
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: present but cannot be compiled" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h:     check for missing prerequisite headers?" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: see the Autoconf documentation" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h:     section \"Present But Cannot Be Compiled\"" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: proceeding with the preprocessor's result" >&2;}
+    { echo "$as_me:$LINENO: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: X11/Xft/Xft.h: in the future, the compiler will take precedence" >&2;}
+
+    ;;
+esac
+{ echo "$as_me:$LINENO: checking for X11/Xft/Xft.h" >&5
+echo $ECHO_N "checking for X11/Xft/Xft.h... $ECHO_C" >&6; }
+if test "${ac_cv_header_X11_Xft_Xft_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_cv_header_X11_Xft_Xft_h=$ac_header_preproc
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_header_X11_Xft_Xft_h" >&5
+echo "${ECHO_T}$ac_cv_header_X11_Xft_Xft_h" >&6; }
+
+fi
+if test $ac_cv_header_X11_Xft_Xft_h = yes; then
+  { echo "$as_me:$LINENO: checking for XftFontOpen in -lXft" >&5
+echo $ECHO_N "checking for XftFontOpen in -lXft... $ECHO_C" >&6; }
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lXft $XFT_LIBS $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char XftFontOpen ();
+int
+main ()
+{
+return XftFontOpen ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+  *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+  (eval "$ac_link") 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } && {
+	 test -z "$ac_c_werror_flag" ||
+	 test ! -s conftest.err
+       } && test -s conftest$ac_exeext &&
+       $as_test_x conftest$ac_exeext; then
+  ac_cv_lib_Xft_XftFontOpen=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+	ac_cv_lib_Xft_XftFontOpen=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftFontOpen" >&5
+echo "${ECHO_T}$ac_cv_lib_Xft_XftFontOpen" >&6; }
+if test $ac_cv_lib_Xft_XftFontOpen = yes; then
+  HAVE_XFT=yes
+fi
+
+fi
+
+
+
+    if test "${HAVE_XFT}" = "yes"; then
+
+cat >>confdefs.h <<\_ACEOF
+#define HAVE_XFT 1
+_ACEOF
+
+
+      C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
+    else
+      CFLAGS="$OLD_CPPFLAGS"
+      CFLAGS="$OLD_CFLAGS"
+      LIBS="$OLD_LIBS"
+    fi
+  fi
+fi
+
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
   if test x"${HAVE_X11R5}" = xyes; then
     { echo "$as_me:$LINENO: checking X11 version 5 with Xaw" >&5
@@ -23405,6 +23681,8 @@ SET_MAKE!$SET_MAKE$ac_delim
 XMKMF!$XMKMF$ac_delim
 GTK_CFLAGS!$GTK_CFLAGS$ac_delim
 GTK_LIBS!$GTK_LIBS$ac_delim
+XFT_CFLAGS!$XFT_CFLAGS$ac_delim
+XFT_LIBS!$XFT_LIBS$ac_delim
 ALLOCA!$ALLOCA$ac_delim
 liblockfile!$liblockfile$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
@@ -23428,8 +23706,6 @@ gamedir!$gamedir$ac_delim
 gameuser!$gameuser$ac_delim
 c_switch_system!$c_switch_system$ac_delim
 c_switch_machine!$c_switch_machine$ac_delim
-LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim
-LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim
 _ACEOF
 
   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23471,6 +23747,8 @@ _ACEOF
 ac_delim='%!_!# '
 for ac_last_try in false false false false false :; do
   cat >conf$$subs.sed <<_ACEOF
+LD_SWITCH_X_SITE!$LD_SWITCH_X_SITE$ac_delim
+LD_SWITCH_X_SITE_AUX!$LD_SWITCH_X_SITE_AUX$ac_delim
 C_SWITCH_X_SITE!$C_SWITCH_X_SITE$ac_delim
 X_TOOLKIT_TYPE!$X_TOOLKIT_TYPE$ac_delim
 machfile!$machfile$ac_delim
@@ -23479,7 +23757,7 @@ carbon_appdir!$carbon_appdir$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 6; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 8; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/configure.in b/configure.in
index f5b3c68b6ba..dc174874e2e 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ dnl To rebuild the `configure' script from this, execute the command
 dnl 	autoconf
 dnl in the directory containing this script.
 dnl
-dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+dnl  Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 dnl  Free Software Foundation, Inc.
 dnl
 dnl  This file is part of GNU Emacs.
@@ -269,7 +269,6 @@ dnl see the `changequote' comment above.
       vax-*-netbsd*)	machine=vax ;;
       arm-*-netbsd*)	machine=arm ;;
       x86_64-*-netbsd*)	machine=amdx86-64 ;;
-      hppa-*-netbsd*)	machine=hp800 ;;
       shle-*-netbsd*)	machine=sh3el ;;
     esac
   ;;
@@ -585,13 +584,6 @@ dnl see the `changequote' comment above.
     machine=nh6000 opsys=powerunix
     NON_GNU_CPP="cc -Xo -E -P"
   ;;
-  ## SR2001/SR2201 running HI-UX/MPP
-  hppa1.1-hitachi-hiuxmpp* )
-    machine=sr2k opsys=hiuxmpp
-  ;;
-  hppa1.1-hitachi-hiuxwe2* )
-    machine=sr2k opsys=hiuxwe2
-  ;;
   ## Honeywell XPS100
   xps*-honeywell-sysv* )
     machine=xps100 opsys=usg5-2
@@ -614,50 +606,6 @@ dnl see the `changequote' comment above.
     esac
   ;;
 
-  ## HP 9000 series 700 and 800, running HP/UX
-  hppa*-hp-hpux7* )
-    machine=hp800 opsys=hpux
-  ;;
-  hppa*-hp-hpux8* )
-    machine=hp800 opsys=hpux8
-  ;;
-  hppa*-hp-hpux9shr* )
-    machine=hp800 opsys=hpux9shr
-  ;;
-  hppa*-hp-hpux9* )
-    machine=hp800 opsys=hpux9
-  ;;
-  hppa*-hp-hpux10.2* )
-    machine=hp800 opsys=hpux10-20
-  ;;
-  hppa*-hp-hpux10* )
-    machine=hp800 opsys=hpux10
-  ;;
-  hppa*-hp-hpux1[1-9]* )
-    machine=hp800 opsys=hpux11
-    CFLAGS="-D_INCLUDE__STDC_A1_SOURCE $CFLAGS"
-  ;;
-
-  hppa*-*-linux-gnu* )
-    machine=hp800 opsys=gnu-linux
-  ;;
-
-  ## HP 9000 series 700 and 800, running HP/UX
-  hppa*-hp-hpux* )
-    ## Cross-compilation?  Nah!
-    case "`uname -r`" in
-      ## Someone's system reports A.B8.05 for this.
-      ## I wonder what other possibilities there are.
-      *.B8.* ) machine=hp800 opsys=hpux8 ;;
-      *.08.* ) machine=hp800 opsys=hpux8 ;;
-      *.09.* ) machine=hp800 opsys=hpux9 ;;
-      *) machine=hp800 opsys=hpux10 ;;
-    esac
-  ;;
-  hppa*-*-nextstep* )
-    machine=hp800 opsys=nextstep
-  ;;
-
   ## Orion machines
   orion-orion-bsd* )
     machine=orion opsys=bsd4-2
@@ -2153,6 +2101,37 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk"; then
   fi
 fi
 
+### Link with -lXft if available to work around a bug.
+HAVE_XFT=maybe
+if test "${HAVE_GTK}" = "yes"; then
+  dnl Check if --with-pkg-config-prog has been given.
+  if test "X${with_pkg_config_prog}" != X; then
+    PKG_CONFIG="${with_pkg_config_prog}"
+  fi
+
+  PKG_CHECK_MODULES(XFT, xft >= 0.13.0, , HAVE_XFT=no)
+  if test "$HAVE_XFT" != no; then
+    OLD_CFLAGS="$CPPFLAGS"
+    OLD_CFLAGS="$CFLAGS"
+    OLD_LIBS="$LIBS"
+    CPPFLAGS="$CPPFLAGS $XFT_CFLAGS"
+    CFLAGS="$CFLAGS $XFT_CFLAGS"
+    LIBS="$XFT_LIBS $LIBS"
+    AC_CHECK_HEADER(X11/Xft/Xft.h,
+      AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
+
+    if test "${HAVE_XFT}" = "yes"; then
+      AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])
+      AC_SUBST(XFT_LIBS)
+      C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS"
+    else
+      CFLAGS="$OLD_CPPFLAGS"
+      CFLAGS="$OLD_CFLAGS"
+      LIBS="$OLD_LIBS"
+    fi
+  fi
+fi
+
 dnl Do not put whitespace before the #include statements below.
 dnl Older compilers (eg sunos4 cc) choke on it.
 if test x"${USE_X_TOOLKIT}" = xmaybe; then
@@ -2884,7 +2863,7 @@ if test "${REL_ALLOC}" = "yes" ; then
 fi
 
 AH_TOP([/* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
diff --git a/etc/ChangeLog b/etc/ChangeLog
index c8b7a2ec1a9..e06094d34b1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,59 @@
+2007-01-27  Kevin Rodgers  <kevin.d.rodgers@gmail.com>
+
+	* PROBLEMS: More details about disabling features that hamper
+	performance with slow X connections.
+
+2007-01-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-prin1.ps (printBackground): Fix background height.
+
+2007-01-20  Glenn Morris  <rgm@gnu.org>
+
+	* cd-dired-ref.tex (versionemacs): New def.
+	* cs-refcard.tex (versionemacs, versionyear): New defs.
+	* cs-survival.tex (versionemacs, versiondate): New defs.
+	* de-refcard.tex (versionemacs, versionyear): New defs.
+	* fr-refcard.tex (versionemacs, versionyear): New defs.
+	* fr-survival.tex (versionemacs, versiondate): New defs.
+	* orgcard.tex (versionyear): New def.
+	(shortcopyrightnotice): Only display last copyright year.
+	* pl-refcard.tex (versionemacs, versiondate): New defs.
+	* pt-br-refcard.tex (versionemacs, versionyear): New defs.
+	* refcard.tex (versionemacs, versionyear): New defs.
+	* ru-refcard.tex (versionemacs): New def.
+	* survival.tex (versionemacs): New def.
+	* sk-dired-ref.tex (versionemacs): New def.
+	* sk-refcard.tex (versionemacs, versionyear): New defs.
+	* sk-survival.tex (versionemacs): New def.
+
+2007-01-20  Giorgos Keramidas  <keramida@ceid.upatras.gr>  (tiny change)
+
+	* MACHINES: Describe how 32-bit and 64-bit versions of Emacs can
+	be compiled on Solaris systems.
+
+2007-01-19  Chong Yidong  <cyd@stupidchicken.com>
+
+	* TODO: Proper background color handling for pngs.
+
+2007-01-18  Bruno Haible  <bruno@clisp.org> (tiny change)
+
+	* emacs.1: Info files moved to share/info.
+
+2007-01-17  Romain Francoise  <romain@orebokech.com>
+
+	* emacs.1: Update bug-gnu-emacs address.  Remove reference to
+	info-gnu-emacs-request@prep.ai.mit.edu.  Update copyrights.
+
+2007-01-13  Michael Olson  <mwolson@gnu.org>
+
+	* ERC-NEWS: Mention new erc-capab.el file.
+
+2007-01-13  Glenn Morris  <rgm@gnu.org>
+
+	* MACHINES: Add information on compiling 32-bit Emacs on 64-bit
+	GNU/Linux.
+	* PROBLEMS: As above.
+
 2007-01-02  Francesco Potort,Al(B  <pot@gnu.org>
 
 	* etags.1: Undocument the --no-warn option.
@@ -3196,7 +3252,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-	2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+	2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/etc/DEBUG b/etc/DEBUG
index bc81d1d5dc2..50171964a59 100644
--- a/etc/DEBUG
+++ b/etc/DEBUG
@@ -1,6 +1,6 @@
 Debugging GNU Emacs
 Copyright (C) 1985, 2000, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/DISTRIB b/etc/DISTRIB
index 8b52ee51418..414e35e426e 100644
--- a/etc/DISTRIB
+++ b/etc/DISTRIB
@@ -5,7 +5,7 @@ the USA, see http://www.gnu.org/order/order.html.
 	   GNU Emacs availability information, October 2000
 
 Copyright (C) 1986, 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1995, 1998,
-   2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 	Permission is granted to anyone to make or distribute
 	verbatim copies of this document provided that the
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index a927419c8c7..d2dcb0b00a1 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -22,6 +22,17 @@ reconnection attempts that ERC will make per server.
 amount of time, in seconds, that ERC will wait between successive
 reconnect attempts.
 
+** New face: `erc-my-nick-face'
+This helps make it easier to distinguish messages sent by yourself
+from messages sent by other users when the value of the variable
+`erc-show-my-nick' is non-nil.
+
+** New modules
+
+*** Capab identify (erc-capab.el)
+Mark users who haven't identified to NickServ on servers supporting
+CAPAB IDENTIFY-MSG.
+
 ** Changes and additions to modules
 
 *** Channel lists (erc-list.el)
diff --git a/etc/ETAGS.EBNF b/etc/ETAGS.EBNF
index 395080b9c0a..1ac66899236 100644
--- a/etc/ETAGS.EBNF
+++ b/etc/ETAGS.EBNF
@@ -94,8 +94,8 @@ those.
 
 ===================== end of discussion of tag names =====================
 
-Copyright (c) 2002, 2004, 2006
-Free software Foundation, Inc.
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/FTP b/etc/FTP
index ea8d50f23de..220d1a1bfd5 100644
--- a/etc/FTP
+++ b/etc/FTP
@@ -1,7 +1,8 @@
 Please refer to <http://www.gnu.org/software/emacs/> for information
 about obtaining Emacs.
 
-Copyright (c) 2000, 2006  Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
diff --git a/etc/GNU b/etc/GNU
index 53d7f576129..5c5c5b64cdd 100644
--- a/etc/GNU
+++ b/etc/GNU
@@ -1,5 +1,5 @@
-Copyright (C) 1985, 1993, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1993, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
 of this document, in any medium, provided that the copyright notice and
diff --git a/etc/GNUS-NEWS b/etc/GNUS-NEWS
index 31f9ad6613e..406858f7fc6 100644
--- a/etc/GNUS-NEWS
+++ b/etc/GNUS-NEWS
@@ -1,6 +1,6 @@
 GNUS NEWS -- history of user-visible changes.
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 Please send Gnus bug reports to bugs@gnus.org.
@@ -521,7 +521,7 @@ A new command which starts Gnus offline in slave mode.
 Copyright information:
 
 Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/HELLO b/etc/HELLO
index 25c2f5f0802..45156f245e9 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -63,8 +63,8 @@ Korean ($(CGQ1[(B)	$(C>H3gGO<<?d(B, $(C>H3gGO=J4O1n(B
 
 
 
-Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006
-Free software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/MACHINES b/etc/MACHINES
index 9d7e81ebb97..0b55a6f3355 100644
--- a/etc/MACHINES
+++ b/etc/MACHINES
@@ -1,7 +1,7 @@
 Emacs machines list
 
-Copyright (c) 1989, 1990, 1992, 1993, 1998, 2001, 2003, 2006
-Free software Foundation, Inc.
+Copyright (C) 1989, 1990, 1992, 1993, 1998, 2001, 2002, 2003, 2004,
+  2005, 2006, 2007  Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This is a list of the status of GNU Emacs on various machines and systems.
@@ -1021,11 +1021,25 @@ Sun 3, Sun 4 (sparc), Sun 386 (m68k-sun-sunos, sparc-sun-sunos, i386-sun-sunos,
 			       sparc-sun-sunos4.1.3noshr, sparc-sun-solaris2.*,
 			       i386-sun-solaris2.*, sparc*-*-linux-gnu)
 
+  To build a 32-bit Emacs (i.e. if you are having any sort of problem
+  bootstrapping a 64-bit version), you can use the Sun Studio compiler
+  and configure Emacs with:
+    env CC="cc -xarch=v7" CFLAGS='' ./configure    # on SPARC systems
+    env CC="cc -xarch=386" CFLAGS='' ./configure   # on x86 systems
+  On Solaris 2.10, it is also possible to use /usr/sfw/bin/gcc to build
+  a 32-bit version of Emacs.  Just make sure you point ./configure to
+  the right compiler:
+
+    env CC='/usr/sfw/bin/gcc -m32' ./configure
+
   To build a 64-bit Emacs (with larger maximum buffer size and
   including large file support) on a Solaris system which supports
   64-bit executables, use the Sun compiler, configuring something like
   this (see the cc documentation for information on 64-bit
-  compilation):  env CC="cc -xarch=v9" ./configure
+  compilation):
+
+    env CC="cc -xarch=v9" CFLAGS='' ./configure    # on SPARC systems
+    env CC="cc -xarch=amd64" CFLAGS='' ./configure # on x86 systems
 
   As of version 2.95, GCC doesn't support the 64-bit ABI properly, but
   later releases may.
@@ -1458,6 +1472,17 @@ Windows NT/95/98/ME/2000
   For installation on all versions of the MS-Windows platform, see the
   file nt/INSTALL.
 
+X86_64 GNU/Linux
+
+  No special procedures should be needed to build a 64-bit Emacs.  To
+  build a 32-bit Emacs, first ensure that the necessary 32-bit system
+  libraries and include files are installed.  Then use:
+
+    env CC="gcc -m32" ./configure --build=i386-linux-gnu \
+      --x-libraries=/usr/X11R6/lib
+
+  (using the location of the 32-bit X libraries on your system).
+
 Xenix (xenix)
 
   Should work in 18.50, but you will need to edit the files
diff --git a/etc/MAILINGLISTS b/etc/MAILINGLISTS
index 531e57522ee..b0b6208239c 100644
--- a/etc/MAILINGLISTS
+++ b/etc/MAILINGLISTS
@@ -318,8 +318,8 @@ mode: outline
 fill-column: 72
 End:
 
-Copyright (c) 1999, 2003, 2004, 2006
-Free software Foundation, Inc.
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
     Permission is hereby granted, free of charge, to any person obtaining
     a copy of this file, to deal in the file without restriction, including
diff --git a/etc/MH-E-NEWS b/etc/MH-E-NEWS
index 8b353fd1102..70cbb5437c4 100644
--- a/etc/MH-E-NEWS
+++ b/etc/MH-E-NEWS
@@ -1,6 +1,7 @@
 * COPYRIGHT
 
-Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 	
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 771294734c6..d835b1f03ad 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,6 +1,6 @@
 More Neat Stuff for your Emacs
-Copyright (c) 1993, 1999, 2003, 2004, 2005, 2006 
-Free software Foundation, Inc.
+Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This file describes GNU Emacs programs and resources that are
diff --git a/etc/NEWS b/etc/NEWS
index cc0acc1d270..e8b5c8a5f08 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-06-04
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
           Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -121,6 +121,10 @@ See the files mac/README and mac/INSTALL for build instructions.
 ** Support for GNU/Linux systems on X86-64 machines was added.
 
 ---
+** Support for HP 9000 series 800 and Hitachi SR2001/SR2201 machines
+was removed.
+
+---
 ** Mac OS 9 port now uses the Carbon API by default.  You can also
 create non-Carbon build by specifying `NonCarbon' as a target.  See
 the files mac/README and mac/INSTALL for build instructions.
@@ -5975,7 +5979,7 @@ an error if the argument actually returns differing values.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 	  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/NEWS.1-17 b/etc/NEWS.1-17
index 0297c928b72..cb8e28d5f96 100644
--- a/etc/NEWS.1-17
+++ b/etc/NEWS.1-17
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  26-Mar-1986
-Copyright (C) 1985, 1986, 2006 Richard M. Stallman.
+Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This file is about changes in emacs versions 1 through 17.
@@ -2511,7 +2511,7 @@ Lisp programming changes
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1985, 1986, 2006 Richard M. Stallman
+Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/NEWS.18 b/etc/NEWS.18
index 9d68613d1ca..ed2abdd7bd0 100644
--- a/etc/NEWS.18
+++ b/etc/NEWS.18
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  17-Aug-1988
-Copyright (C) 1988, 2006 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006, 2007  Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This file is about changes in emacs version 18.
@@ -1601,7 +1601,7 @@ C_SWITCH_MACHINE can be defined by the m- file to specify extra `cc' switches.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1988, 2006 Free Software Foundation, Inc.
+Copyright (C) 1988, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/NEWS.19 b/etc/NEWS.19
index 2d2e5f57066..0b72289dc43 100644
--- a/etc/NEWS.19
+++ b/etc/NEWS.19
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  1992.
-Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007 Free Software Foundation, Inc.
 See the end for copying conditions.
 
 This file is about changes in emacs versions 19.
@@ -6520,7 +6520,7 @@ the tar file.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1993, 1994, 1995, 2001, 2006 Free Software Foundation, Inc.
+Copyright (C) 1993, 1994, 1995, 2001, 2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/NEWS.20 b/etc/NEWS.20
index 44d5600ecb4..ae48b3eb27f 100644
--- a/etc/NEWS.20
+++ b/etc/NEWS.20
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 1999, 2000, 2001, 2006
+Copyright (C) 1999, 2000, 2001, 2006, 2007
           Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -4494,7 +4494,7 @@ select one of those items.
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1999, 2000, 2006
+Copyright (C) 1999, 2000, 2001, 2006, 2007
 	  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/NEWS.21 b/etc/NEWS.21
index 44462b3f827..5c8c9d1d655 100644
--- a/etc/NEWS.21
+++ b/etc/NEWS.21
@@ -1,5 +1,5 @@
 GNU Emacs NEWS -- history of user-visible changes.  2006-05-31
-Copyright (C) 2000, 2001, 2002, 2003, 2006
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
           Free Software Foundation, Inc.
 See the end for copying conditions.
 
@@ -4881,7 +4881,7 @@ support a vertical-bar cursor).
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 2000, 2001, 2002, 2003, 2006
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 	  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
diff --git a/etc/ORDERS b/etc/ORDERS
index 55d222c17cb..8658d536ccb 100644
--- a/etc/ORDERS
+++ b/etc/ORDERS
@@ -8,7 +8,8 @@ can also make tax-deductable donations to the Free Software Foundation,
 a not-for-profit organization (assuming you pay US taxes) - see
 <http://www.gnu.org/help/donate.html>.
 
-Copyright (c) 2000, 2001, 2006 Free Software Foundation, Inc.
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
 
 Verbatim copying and distribution is permitted in any medium
 provided this notice is preserved.
diff --git a/etc/OTHER.EMACSES b/etc/OTHER.EMACSES
index 9b196484604..c6a4bee0794 100644
--- a/etc/OTHER.EMACSES
+++ b/etc/OTHER.EMACSES
@@ -4,7 +4,7 @@ This file describes the differences between GNU Emacs 19, Twenex
 Emacs, Gosling Emacs (including the commercial versions by Unipress)
 and CCA Emacs.
 
-* Copyright (c) 1985 Richard M. Stallman
+* Copyright (C) 1985 Richard M. Stallman
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 7931212fa79..eb7dffe41ab 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -1263,7 +1263,20 @@ be carried out at the same time:
    package.
 
 2) If the connection is very slow, you might also want to consider
-   switching off scroll bars, menu bar, and tool bar.
+   switching off scroll bars, menu bar, and tool bar.  Adding the
+   following forms to your .emacs file will accomplish that, but only
+   after the the initial frame is displayed:
+
+    (scroll-bar-mode -1)
+    (menu-bar-mode -1)
+    (tool-bar-mode -1)
+
+   For still quicker startup, put these X resources in your .Xdefaults
+   file:
+
+    Emacs.verticalScrollBars: off
+    Emacs.menuBar: off
+    Emacs.toolBar: off
 
 3) Use ssh to forward the X connection, and enable compression on this
    forwarded X connection (ssh -XC remotehostname emacs ...).
@@ -2355,6 +2368,16 @@ This results from a bug in a VERY old version of GNU Sed.  To solve
 the problem, install the current version of GNU Sed, then rerun
 Emacs's configure script.
 
+*** Building a 32-bit executable on a 64-bit GNU/Linux architecture.
+
+First ensure that the necessary 32-bit system libraries and include
+files are installed. Then use:
+
+  env CC="gcc -m32" ./configure --build=i386-linux-gnu \
+    --x-libraries=/usr/X11R6/lib
+
+(using the location of the 32-bit X libraries on your system).
+
 *** Building the Cygwin port for MS-Windows can fail with some GCC version
 
 Building Emacs 22 with Cygwin builds of GCC 3.4.4-1 and 3.4.4-2 is
@@ -3686,8 +3709,8 @@ This problem will not happen if the m-...h file for your type
 of machine defines NO_UNION_TYPE.
 
 
-Copyright 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1987, 1988, 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 Copying and redistribution of this file with or without modification
 are permitted without royalty provided this notice is preserved.
diff --git a/etc/README b/etc/README
index 856f8cdfcd4..73ee8c71cfa 100644
--- a/etc/README
+++ b/etc/README
@@ -12,7 +12,7 @@ without installing the modified TeX versions.
 `termcap.src' is included mainly for VMS.  It is a copy of the
 `/etc/termcap' file used on Unix.
 
-Copyright (c) 1992, 1995, 2001, 2006
+Copyright (C) 1992, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 Free Software Foundation, Inc.
 
 
diff --git a/etc/SERVICE b/etc/SERVICE
index e97196d7c95..4d6009e9f36 100644
--- a/etc/SERVICE
+++ b/etc/SERVICE
@@ -1368,8 +1368,8 @@ A current version should be available on our web site at http://www.gnu.org.
 ** Please keep the entries in this file alphabetical **
 
 
-Copyright (c) 2000, 2004, 2005, 2006 
-Free Software Foundation
+Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
     Verbatim copying and distribution of this document are permitted
     worldwide, without royalty, in any medium, provided this notice is
diff --git a/etc/TERMS b/etc/TERMS
index 4b34a45d676..926d6130aae 100644
--- a/etc/TERMS
+++ b/etc/TERMS
@@ -1,5 +1,5 @@
-Copyright (c) 1999, 2003, 2006
-Free software Foundation, Inc.
+Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 This file describes what you must or might want to do to termcap entries
diff --git a/etc/TODO b/etc/TODO
index ded53febbd3..1ebc7592948 100644
--- a/etc/TODO
+++ b/etc/TODO
@@ -1,7 +1,7 @@
 Emacs TODO List                                                   -*-outline-*-
 
-Copyright (c) 2003, 2004, 2005, 2006
-Free software Foundation, Inc.
+Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 See the end of the file for copying permissions.
 
 If you are ready to start working on any of these TODO items, we
@@ -196,6 +196,8 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
   has advice] (x y) The overlay could also be a button that you could
   use to view the advice.
 
+** Add a function to get the insertion-type of the markers in an overlay.
+
 ** ange-ftp
 *** understand sftp
    This is hard to make work because sftp doesn't print status
@@ -341,6 +343,15 @@ typically due to pilot errors and should thus be in debug-ignored-errors.
 ** Allow unknown image types to be rendered via an external program
   converting them to, say, PBM (in the same way as PostScript?).
 
+** Display images with alpha channels, such as png, with the current
+background color of whatever frame it is displayed in.  Currently, we
+use the default background color if specified in the png file, or, if
+that is unspecified, the background color of the frame in which the
+image was first created.  Ideally, the image should display the
+background color of whichever frame it is being displayed in.  The
+main complication is that this will require the loading of a new image
+object for each different background color.
+
 ** Allow displaying an X window from an external program in a buffer,
   e.g. to render graphics from Java applets.  [gerd and/or wmperry
   thought this was feasible.]
diff --git a/etc/TUTORIAL b/etc/TUTORIAL
index ff1075c17bb..ec8ce7c686a 100644
--- a/etc/TUTORIAL
+++ b/etc/TUTORIAL
@@ -1105,7 +1105,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.bg b/etc/TUTORIAL.bg
index bf6f0af8bd5..cc8b2c5b2c5 100644
--- a/etc/TUTORIAL.bg
+++ b/etc/TUTORIAL.bg
@@ -1170,7 +1170,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.cn b/etc/TUTORIAL.cn
index 31525277d84..5e318e8ff90 100644
--- a/etc/TUTORIAL.cn
+++ b/etc/TUTORIAL.cn
@@ -987,7 +987,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
@@ -1012,8 +1012,8 @@ GNU Emacs to your friends.  Help stamp out software obstructionism
 
 ±¾ÆªÎĵµÓë GNU Emacs Ò»ÑùÓµÓаæȨ£¬²¢ÔÊÐíÔÚÏÂÁÐÌõ¼þµÄÔ¼ÊøÏ·¢ÐÐÆ俽±´£º
 
-   Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
+   Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007  Free Software Foundation, Inc.
 
    ±¾ÎĵµÔÊÐíÔÚ²»±ä¸üÎĵµÄÚÈݵÄÇé¿öÏÂÓÉÈκÎÈË·¢²¼ÔÚÈκÎýÌåÉÏ£¬Í¬Ê±±ØÐë
    ÍêÕû±£Áô°æȨºÍÐí¿ÉÉùÃ÷£¬ÇÒÐè¸øÓèÊÜÖÚÓë·¢ÐÐÕßÍêÈ«ÏàͬµÄ¡¢Èç±¾ÉùÃ÷ËùÔÊ
diff --git a/etc/TUTORIAL.cs b/etc/TUTORIAL.cs
index 5b0e20ce218..fc4650d0fa2 100644
--- a/etc/TUTORIAL.cs
+++ b/etc/TUTORIAL.cs
@@ -1023,7 +1023,7 @@ Tato verze tutoriálu je, podobnì jako GNU Emacs, chránìna copyrightem a
 je ¹íøena se svolením distribuovat kopie za jistých podmínek:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Ka¾dému je zaruèeno právo vytváøet a distribuovat pøesné kopie tohoto
    dokumentu tak, jak jej obdr¾el, na jakémkoliv médiu, s tím, ¾e bude
diff --git a/etc/TUTORIAL.de b/etc/TUTORIAL.de
index c181d596065..abdc1fec6ab 100644
--- a/etc/TUTORIAL.de
+++ b/etc/TUTORIAL.de
@@ -1460,8 +1460,8 @@ geschrieben.  Übersetzer ins Deutsche ist Werner Lemberg (wl@gnu.org).
 Beachten Sie bitte, daß im Zweifelsfalle das englische Original dieser
 Urheberrechtsnotiz gültig ist (zu finden in der Datei TUTORIAL).
 
-Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Hiermit wird für jedermann die Erlaubnis erteilt, wörtliche,
    unveränderte Kopien dieses Dokumentes für jegliches Medium zu
diff --git a/etc/TUTORIAL.es b/etc/TUTORIAL.es
index 0860cb7972c..7fdd96811e5 100644
--- a/etc/TUTORIAL.es
+++ b/etc/TUTORIAL.es
@@ -1188,7 +1188,7 @@ siguiente nota de derechos de reproducción (que puede encontrar en el
 archivo TUTORIAL).
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Se permite a cualquiera hacer o distribuir copias literales de este
    documento como se recibe, en cualquier medio, siempre que la nota
diff --git a/etc/TUTORIAL.fr b/etc/TUTORIAL.fr
index 0c8b3d3ee9b..88dc98a088c 100644
--- a/etc/TUTORIAL.fr
+++ b/etc/TUTORIAL.fr
@@ -1171,7 +1171,7 @@ copyright, et vous pouvez en distribuer des copies sous certaines
 conditions :
 
 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Chacun peut créer ou distribuer des copies de ce document tel qu'il
    l'a reçu, sur n'importe quel support, pourvu que la note de
diff --git a/etc/TUTORIAL.it b/etc/TUTORIAL.it
index 84e10878fa8..58cc721f6f4 100644
--- a/etc/TUTORIAL.it
+++ b/etc/TUTORIAL.it
@@ -1093,7 +1093,7 @@ distribuito con il permesso di farne copie a determinate condizioni:
    indicativo, restando comunque inteso il fatto che è quella originale a
    fare fede.
 
-Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
    È permesso a chiunque copiare e distribuire attraverso ogni mezzo copie
    fedeli di questo documento così come viene ricevuto, a condizione che
diff --git a/etc/TUTORIAL.ja b/etc/TUTORIAL.ja
index 826a175e8c6..3452c02f0f8 100644
--- a/etc/TUTORIAL.ja
+++ b/etc/TUTORIAL.ja
@@ -1048,7 +1048,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ko b/etc/TUTORIAL.ko
index 9a9f28612c5..9f3d66a48af 100644
--- a/etc/TUTORIAL.ko
+++ b/etc/TUTORIAL.ko
@@ -990,7 +990,7 @@ GNU $(C@L8F=:?M(B $(C00@L(B $(C@L(B $(CAvD'<-(B $(CFG@:(B $(C@z@[1G@L
 $(C6'?!(B $(C:9;g:;@;(B $(C9hFwGR(B $(C<v(B $(C@V4B(B $(CGc0!8&(B $(C0.0m(B $(C3*?B(B $(C0M@L4Y(B:
 
 Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    $(C@L(B $(C9.<-4B(B $(C@L(B $(C@z@[1G(B $(C0x0m?M(B $(CGc?k(B $(C0x0m0!(B $(C1W4k7N(B $(C@/Av5G0m(B, $(C9hFw@Z0!(B
    $(C<vCk@Z?!0T(B $(C@L(B $(C0x0m?!(B $(C5{6s(B $(CGc?k5G4B(B $(C0MC373(B $(C6G(B $(C@g:P9hGO4B(B $(C0M@;(B
diff --git a/etc/TUTORIAL.nl b/etc/TUTORIAL.nl
index 1efe9748803..f86d0b40b69 100644
--- a/etc/TUTORIAL.nl
+++ b/etc/TUTORIAL.nl
@@ -1204,8 +1204,8 @@ het Engelse origineel.)
 Deze versie van de inleiding valt onder copyright, net als GNU Emacs.
 Je mag deze inleiding verspreiden onder bepaalde voorwaarden:
 
-Copyright (C) 1985, 1996, 1997, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Iedereen mag letterlijke kopieën van dit document, zowel ontvangen
    als verspreiden, op elk medium, vooropgesteld dat de
@@ -1229,8 +1229,8 @@ software te gebruiken, te schrijven en te delen!
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 1997, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1997, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/etc/TUTORIAL.pl b/etc/TUTORIAL.pl
index e1cfeec9dab..352d92b46b4 100644
--- a/etc/TUTORIAL.pl
+++ b/etc/TUTORIAL.pl
@@ -1218,7 +1218,7 @@ Ta wersja samouczka, podobnie jak GNU Emacs, jest chroniona prawem
 autorskim, ale wolno j± kopiowaæ pod nastêpuj±cymi warunkami:
 
 Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
 Zezwala siê na wykonywanie lub rozpowszechnianie
 wiernych kopii tego dokumentu w otrzymanej formie, na dowolnym
diff --git a/etc/TUTORIAL.pt_BR b/etc/TUTORIAL.pt_BR
index b9309d31d5d..849075ec9a9 100644
--- a/etc/TUTORIAL.pt_BR
+++ b/etc/TUTORIAL.pt_BR
@@ -1063,7 +1063,7 @@ Essa versão do tutorial foi originalmente traduzida por Marcelo Toledo
 <marcelo@gnu.org> e como o GNU Emacs, tem um copyright, e vem
 com uma permissão de distribuição de cópias nas seguintes condições:
 
-Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permissão é garantida a qualquer um para fazer ou distribuir copias
    integrais deste documento como recebido, em qualquer meio, deixando
diff --git a/etc/TUTORIAL.ro b/etc/TUTORIAL.ro
index 3a4c7fb77af..159796403d4 100644
--- a/etc/TUTORIAL.ro
+++ b/etc/TUTORIAL.ro
@@ -1091,8 +1091,8 @@ continuare noþita de copyright originalã în limba englezã.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1998, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+   2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.ru b/etc/TUTORIAL.ru
index 4a097635a59..9fc54ba121d 100644
--- a/etc/TUTORIAL.ru
+++ b/etc/TUTORIAL.ru
@@ -1132,7 +1132,7 @@ Dired ÐÏÚ×ÏÌÑÅÔ ×ÁÍ ÏÔÏÂÒÁÖÁÔØ ÓÐÉÓÏË ÆÁÊÌÏ× × ËÁÔÁÌÏÇÅ (Á ÔÁËÖÅ
 ÓÌÅÄÕÀÝÉÍÉ ÓÏÇÌÁÛÅÎÉÑÍÉ:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.sk b/etc/TUTORIAL.sk
index 6b2cd86bf91..7194654736f 100644
--- a/etc/TUTORIAL.sk
+++ b/etc/TUTORIAL.sk
@@ -1081,8 +1081,8 @@ tútorialom napísaným Stuartom Cracraftom pre pôvodný Emacs.
 Táto verzia tútorialu je, podobne ako GNU Emacs, chránená copyrightom
 a je ¹írená s povolením distribuova» kópie za istých podmienok:
 
-Copyright (C) 1985, 1996, 1998, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Ka¾dému je zaruèené právo vytvára» a distribuova» presné kópie tohto
    dokumentu tak, ako ho dostal, na akomkoµvek médiu, s tým, ¾e bude
diff --git a/etc/TUTORIAL.sl b/etc/TUTORIAL.sl
index 3cb38ace65b..a682d9acbe0 100644
--- a/etc/TUTORIAL.sl
+++ b/etc/TUTORIAL.sl
@@ -1115,7 +1115,7 @@ To besedilo, kot sam GNU Emacs, je avtorsko delo, in njegovo
 razmno¾evanje in raz¹irjanje je dovoljeno pod naslednjimi pogoji:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Dovoljeno je izdelovati in raz¹irjati neokrnjene kopije tega spisa
    v kakr¹nikoli obliki pod pogojem, da je ohranjena navedba o
diff --git a/etc/TUTORIAL.sv b/etc/TUTORIAL.sv
index 732d1fa397e..2a54047e8dc 100644
--- a/etc/TUTORIAL.sv
+++ b/etc/TUTORIAL.sv
@@ -1127,7 +1127,7 @@ This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.th b/etc/TUTORIAL.th
index 1156925e2a5..8e70bc4fc71 100644
--- a/etc/TUTORIAL.th
+++ b/etc/TUTORIAL.th
@@ -970,8 +970,8 @@ starting with the one written by Stuart Cracraft for the original Emacs.
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
 
-Copyright (C) 1985, 1996, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1985, 1996, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/TUTORIAL.zh b/etc/TUTORIAL.zh
index 0a04da4d9e1..2793312763b 100644
--- a/etc/TUTORIAL.zh
+++ b/etc/TUTORIAL.zh
@@ -1050,8 +1050,7 @@ issue here>¡v¡C
 ´²§G¨ä«þ¨©¡G
 
 Copyright (C) 1985, 1996, 1998, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
-Chinese Translation by Chao-Hong Liu (2002, 2003)
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/etc/Xkeymap.txt b/etc/Xkeymap.txt
index dca688bd701..fa97f7da014 100644
--- a/etc/Xkeymap.txt
+++ b/etc/Xkeymap.txt
@@ -1,8 +1,8 @@
 #						-*-Mode: Fundamental-*-
 # X keymap file for rlk with some emacsified bindings
 #
-# Copyright (c) 1999, 2003, 2006
-# Free software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 # See the end of the file for copying conditions.
 #
 # This file contains the default keyboard mapping.  The first column contains a X keyboard code; the other
diff --git a/etc/calccard.tex b/etc/calccard.tex
index befdea965ae..52ed529583c 100644
--- a/etc/calccard.tex
+++ b/etc/calccard.tex
@@ -14,7 +14,7 @@
 % Typical command to print (3 cols):  dvips -t landscape calccard.dvi
 
 % Copyright (C) 1987, 1992, 2001, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -60,7 +60,7 @@
 %  Internet: gildea@stop.mail-abuse.org
 
 \def\versionnumber{2.1}
-\def\year{2006}
+\def\year{2007}                 % latest copyright year
 \def\version{v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
diff --git a/etc/compilation.txt b/etc/compilation.txt
index abf8ecdf9c3..933b486bb0f 100644
--- a/etc/compilation.txt
+++ b/etc/compilation.txt
@@ -406,8 +406,8 @@ Compilation exited abnormally with code 1 at Wed Jul 20 12:21:12
 Compilation finished at Thu Jul 21 15:02:15
 
 
-Copyright (c) 2004, 2005, 2006
-Free software Foundation, Inc.
+Copyright (C) 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/cs-dired-ref.tex b/etc/cs-dired-ref.tex
index 46f7d7c6985..eb06158f81d 100644
--- a/etc/cs-dired-ref.tex
+++ b/etc/cs-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % Czech hyphenation rules applied
 \chyph
@@ -48,8 +48,9 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2006}
-\def\version{May \year\ v\versionnumber}
+\def\versionemacs{21}
+\def\year{2007}                 % latest copyright year
+\def\version{May 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -59,7 +60,7 @@
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version 21 on Unix systems}
+\centerline{for GNU Emacs version \versionemacs{} on Unix systems}
 \centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
 
 Permission is granted to make and distribute copies of
@@ -255,7 +256,7 @@ MA 02110-1301, USA.
 
 \title{Referenèní karta pro Dired}
 
-\centerline{(urèeno pro Dired v GNU Emacsu 21.x)}
+\centerline{(urèeno pro Dired v GNU Emacsu \versionemacs.x)}
 \centerline{Pøíkazy oznaèené \dx{} vy¾adují dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/cs-refcard.tex b/etc/cs-refcard.tex
index 762b33f3d09..939111131c8 100644
--- a/etc/cs-refcard.tex
+++ b/etc/cs-refcard.tex
@@ -12,7 +12,7 @@
 \columnsperpage=1
 
 % Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -66,7 +66,8 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{2006}
+\def\versionyear{2006}          % latest update
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -75,7 +76,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 21, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -265,11 +266,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \title{GNU Emacs -- Referenèní karta}
 
-\centerline{(pro verzi 21)}
+\centerline{(pro verzi \versionemacs)}
 
 \section{Spu¹tìní Emacsu}
 
-Pro vstup do GNU~Emacsu~21 napi¹te jeho jméno: \kbd{emacs}
+Pro vstup do GNU~Emacsu~\versionemacs{} napi¹te jeho jméno: \kbd{emacs}
 
 Jak naèítat a editovat soubory se dozvíte ní¾e v~oddíle Soubory.
 
diff --git a/etc/cs-survival.tex b/etc/cs-survival.tex
index cf8297e7f39..20a88118481 100644
--- a/etc/cs-survival.tex
+++ b/etc/cs-survival.tex
@@ -21,8 +21,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -50,12 +50,14 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2006}
+\def\versionemacs{21}
+\def\versiondate{duben 2000}    % latest update
+\def\year{2007}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
     Copyright \year\ Free Software Foundation, Inc.\break
-    Verze \versionnumber{} pro GNU Emacs 21, duben 2000\break
+    Verze \versionnumber{} pro GNU Emacs \versionemacs, \versiondate\break
     W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Do èe¹tiny pøelo¾il Pavel Janík (Pavel@Janik.cz)
 
@@ -164,7 +166,7 @@
 %**end of header
 
 
-\title{Karta\ \ pro\ \ pøe¾ití\ \ s\ \ GNU\ \ Emacsem}{pro verzi 21}
+\title{Karta\ \ pro\ \ pøe¾ití\ \ s\ \ GNU\ \ Emacsem}{pro verzi \versionemacs}
 
 V~následujícím textu \kbd{C-z} znamená: stisknìte klávesu `\kbd{z}' a
 souèasnì pøidr¾te stisknutou klávesu {\it Ctrl}. \kbd{M-z} znamená, ¾e
diff --git a/etc/de-refcard.ps b/etc/de-refcard.ps
index bda6d6360db..7d88949168f 100644
--- a/etc/de-refcard.ps
+++ b/etc/de-refcard.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: de-refcard.dvi
 %%Pages: 2
 %%PageOrder: Ascend
@@ -11,7 +11,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t landscape de-refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2006.06.28:1519
+%DVIPSSource:  TeX output 2007.01.20:1516
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -453,6 +453,7 @@ dup 50 /two put
 dup 51 /three put
 dup 53 /five put
 dup 54 /six put
+dup 55 /seven put
 dup 65 /A put
 dup 66 /B put
 dup 67 /C put
@@ -521,255 +522,259 @@ B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E07BB563C96C0A3E
 CCBD1F58ABBF1F53AD21E3BFF25EEEB046F66A924E5F431EBD7228050BE2DF43
 0B9B538DAAD511EED97630CD9A9C05CC49DC251325A93EA842C6D07B44BE620F
 08E66B611F54314B0177E299304F2294F8DEDE9914736944F125A50B5007373E
-588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF212
-431EB91CBBEC858F1F684438489B4069534169702F2EB2E68AF105F230938AC2
-0BDCBD3048CEC0AAE737C38E18FE00ECF6F53A612082AB7B1E562F91996D08C4
-6B7233038D22B17E3020363BCF7015F1FFFD4BE703D97D13C6D88081D27CEE8E
-7887B7EB60E1CC96432AC641AD3CC1C1CBDA2BE6897E7C4A84D9922DDC3359A0
-7D27E936384361D722A5A567067872A08BE931D2F47C95239487DC8E77C17F4A
-CB408916AD0D5450A94CACBC787B5ADA4555ECE3BFB29AA0DE1258E649A6D625
-27877CA246BC5B6C6C4E399051CED80C2461C9C892918C18B181594189D8C61A
-89CB1072E344ACFC7113725E23188C4293353D5261AFE82E4A05315619069D8C
-02E01CBE5A96A58ECDCAB2CC35553784250AD477B924469030723F1D577B1D5D
-6B704C104F726FD8EEEE2C04BF978653E92E357F5ED50F1F8D19DF29F53FE639
-834078AF1D3F52AA8A077D2518D5CE5532D249C5244926660C754DA99E3756CC
-21DDE5E6CA670CF99AFF35C72C596916EEA2116FC3C99941570D5612B528E721
-DCDB4DD84B89079439E767C8DF9D11642D37E9856DADE788FECEBF9E3189C8FA
-58A4E80DF82335AB1BC51D488E0171299CDCCA45B125314A47416F27925A4660
-A5BAFE65E113DF24C2D4FF329F5AE1D470864F9787AEA3D140A9F68CA1D5D5E6
-7FF87A087473494D918ECE4341A8FAEC893E2DF261E507C73AFD1074881BE58B
-92CB7CEA2E7F91503F40CD8A2924F30F6468C50805C00299B251E7094D889F1F
-C4F5127AFE0F33E92BC0BEB9EB4C60CA056AC4F3B34877DFC4055B7C73199571
-7E297425FFCE9FC9DF27C9F3D6884BA78F8D2D8F7480BFC4CC5C69D63F4A4B24
-5C6C388B2EE4227218995772F764F3E6E2B39C65B922B62B37EE2AD8D15F2A81
-FB8B7093701514B0BE4B6F13BEA4678C17558FF8C9AA78DF6DB37333C67E150F
-378C10E11AED4494F570C688E41B81D36EEAB08D1D1231D84AB961F81B0F1D92
-F3738A3E5E40842C837C2F33BAD69A8BB6A190C539886025C020F7DC29962A99
-D960893177A60DDFE1FC9DC077C4E064FF272C3EE149D106266EE7399402DD5B
-92C72CB6982814CC533202DD31F0A8A0DAA8B433D2DE82F6F2882B8980D15084
-FA2B8D8EBFF43B72A7B69EC89F1AE10CC08C89C8B8F89D7D859A3D279BB77587
-6C1E5FB70CDF206818C4878EEDA2C2F7EC2921DA078A80453FD409DADF4FE803
-AC477EF6185ECD8AEB3CE5ED7C80610A73B2C348CB16808FEF915F89ED13D8E6
-1C86E8E6EF57DAC4C5F6DE3DE866D99685F056E792661F90A3EBC97CFA16F856
-06F9025855691C5167E685EF43D78C8DD5CCD6CB870E0F5D5C7570EE368E22B0
-D1A3C788DAEC75C5F32237B27559AA0714879CD917A911D556D0E90F8455DF8A
-8AB4160822C85760F8B85FADA78C6FC52DAB8ACC7748ECB3E25FFAAD03FF6604
-3EB57E4FE6EDCA66A10B5EFE83F13D19267A5718241F6F2CBB4091FCEAFF4A66
-B4CA8A2362E57FF63496D84FB3A85776AE2E96F91F9621DE70585948153A180A
-13806288D36FCAD514C6F2088CF8E711A2B32A2031B422B12BE37E8F97FF0725
-4F653AB223E451EFF52F7694773A976E6631096C49E57C216F529FD8EAF6A7B9
-5494F7897984DA5A45DC1971A55EA031D60A5A8B90999409BF6B519456AA1D6B
-AFCB44119AFEFA2438F9FB72AD4CCE2623ECF85AC1729509C30BD5225DF18735
-214EB1A24B56912EB2A20136BED48EA96AFFE191A90081E8E2618E38D37E72E6
-FE9E3F152CD6D71C04F3877DA187BB016C213ED8E089109A1DCD3ABEE77C3FF9
-3FB915A1E91AAF09D66F769976E8E21C42397BB38E2AF085EE4150155EACC28D
-C94A98F4529C125C588C04D47931F8296A115C19E97DE27A73A733347D437BFD
-202BF862D3BE0E73B28DF9CF6C0DE9402BB00244AFA261D80BE7CC8A41B71934
-AF7FAA22BA975CDA4401B92EC54D06740E27B9DF9155499DDB5BDA630F22C3DF
-8C903557AF50AC67EB76639AD0EEED54E16D1D904E51DB577F32D100C8CE179B
-15B850560024800F6C98BB56406EB8EECC5F2C44880BE1595C733FB906C672D5
-97F0B558598E4932084A5BF9FF7D930150924751849FF74218DB3FA6889DA40A
-3DC28324B57DC3837D21FE8BDAD593B847D168BA3D8578773A5655C324261032
-6E59A2BB9DEAB29608F4E7771AC48A7C72F7840EC635F7E6B810A58B7729BC8F
-AAB826667840635497AFF7CA62BADDCAD3EEFFB9A33307E3866EAE10650E6361
-2F09D31CD3BCC0305A404DF6EB912C18B5EE2ED5DECE7A4C2611A58FC8FB38CE
-D35C0D0BD5E3E0889446B74E768CA7C044F6774EE964788DA57F58AC709A16E1
-3ECD5478705E6CA2708CE631A6C37D1E944FF8A385B940DEED3A9F1E5C2C6900
-E3B9AABCA329E567445A2F8BA7F5CC70BB17C26A9C2B5509F00C978B9198474A
-484382D50BF6C64D72586C132FA1EBBB8F714FA3FB127E44790439D740081823
-CD8A4ED49003D12AF87E90E7DD357DA2E14EA643E73EE27C47DF75231B455741
-E6791ADB45935C0B625BF7326BEA92D2D0A88B706E8236B205E9AD1A9EFA0477
-20B843482FF05529FE3645503A97CD34444B3D0146A0391F4F1131898AC0069E
-8A82A8DA0FD9AD316357D6933707F5C6A31FA21F2FB34C0026AA3B8D7CED7DD8
-18EAFFBBFB2A4D290A8CB04532E53A5A6790FAE61B8F76972CBE161BFC5EF7F1
-8ED0C58A3261F00DF3683F191DC627D70F226A688B00EFD4A948F8CB4DCDA490
-D35DC0898439A2258CE37E776D9F638055AC5929B24368CBD322497284F15A26
-5410EDEE3F38BDE0222D1D7257970EF472CFA8144794BA782F0EDF268A991CCC
-0103415AE3EEDFC3E8C4CB76791C633E9697E936246F38F66D8AA2F0DAB59729
-25349FE319F9805CD8EF3D3063F217F8B23100E219555B3BE19C2D4648E6B722
-604635016D0358841EF9D9292035E0E981F80BE959AE6F23B272284A9DCC0E88
-AEDA62FB1175AD3DD83A9BC80295D4E03A582FA92A264FCB50C58503208C605C
-39522FF69D5D17929D73161AD851599100AE98EAAD3FA88B3BE77F4DE309B603
-30A30E1B646C97BF007873CCA779D62AB3C8BC0C274AE46F05BC02456F769A9B
-7978AB6DCC6F1F704658793168789F3B70241B9779C03A22C6A16E45CBFADC66
-51A1FA529591E19393FA0D85896E3B36F048979426442CE0A00CF03FB8669177
-6B22DD77CED300A26838CFD0134DC657F571F49C031568E3F92C6D6D9A5190A2
-A2227F45D145D1DBA367BA3A767570F3683616C089BC0A9D559A1DD1654E11A7
-A2E1BC6812B80CB1F9A5604B60369A2B7BB8A11D63D1E6A5CAD7AC554EA83DF9
-0D562F75A758F1C9120CF3079788064BF639D92312850BC4D0118A41826D7BAE
-FED9C372043E204C4E5AF0846DD2BA3673D0A33CC9708681BC3FA023A63B64B9
-5B2F2043B02149D67E341DC01B2344AFB040ED9CDD8135B61AC32C94DB5D5179
-DB669FBF2E14883EAFFDB4A53AF6C75871C90DC0D6DDAC1A83E8B22000B52215
-6040E571B4AF486D1F64424D1F85D5792CE1EB51D0BEA2D79E68A4C06A745A14
-1005103C2C60F6497300339F56EDB34C5D0B72219D27F275EF48AA614BD1F1ED
-DDAEA676122837C8A0A432FD639A9965B1B4B868AF3E0CC4A38367A2318F2332
-7E7BBCCDD3A9569CFFC43BB0F559821D08DFEF856EE435EB1C6403D544147515
-483F7F81F5DE322720B4B618FA32908423FB3A0A16AB120F8F3AAE2F20B7FE5A
-89E0E34C7C77153C1D93713D6377AAAFD6BCA6FFF9E0074885553CCBA1EC52A0
-B1F1CA48300622C77E7F230D4A4FA474E66F8E69FA0D63E268CD0C855D1BFAA3
-4B2666F9CD0C56885DBC75C726F8FDBD928B8E92EE55CDDF38750A226AB9A47F
-5FDADEE859AA57BFC0A84105E82D00B1B05C4FE97A72E1B34808CAEEAA81AF9A
-A57014F58A8B11B9835E2D53FDED0E96D2E90AFAFADA4C816CA73E15B32B4ACB
-BF439EE68A1CDC575295B51D2CE017955718F4F354D158EEEEB3F76558C9C525
-3DE6B793EBBC2CB895E506CC6C5CAD613D2C9CBA1AEADF94BED1303A2EEF64ED
-58F22E87EC454C2551873F13CB486DA4A031E065DC2C2BF5912B7B2197B33330
-9CBCE81D0475A457B4740A59A5BEA38200CBA94F197A1FE57FFC2B596E62A1A7
-96BE20C0153B2C78D04B5B230FE32E39D5BBF0A8C93F409E7A9072FD44C20F2B
-49469B5DD8EA43A59F34C123E6646C8F7BA2A0A257D770155B809D9AD1E48BB1
-6843DBD39B49BC7DC434542AF7DCD3479F5EEF7D51CE554786F699B104F2F6B6
-C0A5C0C625E68632458C24FD97DCA6535C8F37092B49026CEE90B27AFFEC7626
-6D1CAB3B671150E9428460521AA5E8C738D54B2CC7C1B71992EBB0B9B10BB0DA
-812FBD6A84FD59598A4177BDBD2B0576C7CA12D06E1467C968C4B6326F6FA67F
-C27ED109C763286C9E266FAEA69C50626B2FD3B1AAE9B579335B9C56C6BE1E1E
-F10735777059B7583CB793E2AE64700EF97376CDAF0407BCC87FCC87A78BEBE6
-4DFFCB132C1F7B4858CE82D129B8540876CE13B5DF27073075727C0C032F3ACA
-59630875A51FC480B2861448E546B9D104860A8F548BC66FF9D18B29440159F7
-506B54565FF8A0334FBE9717FA90C3782D8A1BA48B848D2DF24D1F02DBDCE921
-B21A696645BFBBBC0B987245352BDC291E401B9938FF605A919CC880B005E243
-C9366DE0D8B4BDD8842E921D6576E716F970E6046DD47E577986041019EEA97A
-23B84CB6E7A0216B4F56954D825D5A69248D2A00DBAA346DBCB6A04E80B54D82
-43B9711DF05BDBDB329C768AFD088F05B50B2D1F90E778ACBFF2C8B170932953
-51983019F5A10C4D3A225A27B8DB28EDA2CE3F6212FF8A1DBB8C49A540DFE676
-BC3D88192F38EC7F59B3D698C628161B3D8DFC28F7B1B318B088BFB8E9EFA610
-5F053E07DEE7A4CD6FB818FF083C1200B56297133C5807E4B46C055242CDFCDB
-71C538A1AB6E3795F8302627F65B8F2F42C0F849EF756F2E42EEC8BC179670F9
-0A1CC1C45E8818AE8EEB573A0748BA348614939CDF525DC6D31601225838E2DA
-510517A77A63B07C6D825F9046047DF3D9ABEF4F521BEC63E18A6FF8B2F12DF1
-E98D7ACA2B36FD0E055087B4578CA4F89410AFD771DF2B6DD717AC499541024E
-9781B778335854FB38E4E686E4FF6600726A885BB5FFAB4D6708D7D9281EBACC
-11B2893AFAAD528643A2231CDC2C0FC70CD192A6A48300E8C95F5D124389D6EF
-A1D40241EC9CED46BEFC3A665FF2E98B6D03132B2D1788B57FC614B8E1407233
-6469E00AD5CE6190D61927941803A8FABAAD68F75FB70A99C035316B4CE76E91
-EEFD9373A4F899E21496725F0DEDE061B8FF5777C5964ADABA2E1BC290C33B50
-2BF50A9E69983F9F5A8FDD0C6AC6DF664F5C458CC00D172A8774441353B35701
-1478ED520F896E14F7EA3ACCAAE214FBD87C93B7CCBB9AB5D570C550E7583D00
-0B6243366EA4358358CF57C475FE78D871C4D1C255D2C323B6E76C45434EF62C
-BBA663EBD77102519F1D8ED9E234385D958786EC14814E190AB76240B7F49999
-FD123E69A2A172A174C6AF3E751521E0245AD794CE03151EEF2BCAB86B7BC55C
-842A38D8ED1585A879E0FDE5A45A1EB894E4C1CA2AF321FD4486E803703BCDA2
-C53C2D1316CDA90D30692EE9BD3B89F091394C5973DF193259C27EA49B1D76DB
-9C05F0C2F0AA48579E8668B8C40BDBC4603DA2CD158B999774DFAAD2C3B32A06
-AF9FEAB53F4EB7326390D9AC3405F32158FAEDF55ECD8EB7B6D63B930E62E2E5
-428C3FF37AB4AC10F3C88630D44FCF405495D85640AB50C8955702117136AF37
-FC4721C97A599CDFF555640386A351C8C060CE2205BE70797D1B2E52173CD4AC
-2B8591855640D351C04BF8E9E2F602B2666F808425CEF3CFAEB631B46F718E63
-E38CBDE84AA1EE1ACEB315A0FC82695829001188F46B0ECF3DDBEFEC299E304F
-EA7328BB3962BB23BCD1B6A851ABAB146B85A03658008767762A5BC2DDF63A6F
-60615171DC9FB7AFF10387FF1EF8E7EB14B4436EECEE7E3A733845DBD9B91289
-45CFC548EA655BB735681BB97C535CD647DCB0CADA1697D6A9A55825518659ED
-7F89A12505BE6DDD90E19B6F0B0514A04696AA60F182E07D586F88225A4E5448
-9129C3FFD18215BF6504347D40EF587DDB93A8D14647D5B61098821F69A388FC
-ED006D017EE6DC6325A700651823E557EF6384312AAD84A050A6C97229FB9A51
-8D9A03B3CD1405464D2E0FBBCBECA29C6E9DD5F0C88DDB29789D516C99FC65E9
-47317E3DB44ACD68C85F568D9F1CCEB0E80C77A52F36F3A4E3B3B555ABA8D52C
-71065953FC657636B8B87B0AD07ACCC3ACA84ADCF4264C6116F11FCBFAE5961D
-5E0B1562268274E46EFC1AC960B7E7C276CEA806D5306051D19D5F6ED5DF421C
-2CAB8179807A9937ADDC6A772F6DDB47EEEF0A03A44AC6C69FF479BCD034CE14
-38A84B932ED0211CEB75BF717687A9C1189633C215EB3F86584621801B5B76BC
-A3DDEFF5C14DED8A27771E5747B0D55F03758646346B4208536E6765D4EB4B94
-187E43C3D9A553261DD98126C7CC75113F171959BB9B988B1825313EA32F580A
-742B91B28845EA9642D9802824C2DF1F45AB928CBF9E35E1C6FA7FA8FD4C7A3B
-8604737DF9FE7B943568BA700A0EED8461A2B8FDA781B57E332C59480F9DB140
-CD62605506DE711D61680AC3AD9D65CF4E7DC88B62A74A381E96F686176D4BDA
-ABD81651C5D69B583B36B35E317F30172C2A59BEEF138B369C3D23851A1C3A07
-0464D4BE1F14AE91F6C75F83EC4112FDCEB5E81ED4BEBF00A0386265D28A3C9F
-13A581FDBF7308D8BA973B163C0B11EC44C980624BB9A7C2B946FAB60F60D8FB
-0D005E0B77B9485D3EE5E7FCAA6D358CDF397B55C5FA9B8B33BED58FBF576E6A
-72C41AC49DC6988EF853455961D5755C5F749A9808474BC3852AAFD79663C14F
-27FD8889E6E96F8815849C878859ABEBDF21FD1256A1496842642BFC5D40D790
-7DB9F87969D90958689F97251B8F36FF181551D2956CAEDDB1CBA0087BB4C9B9
-0CC913C0F95563C6D70EB030F665AD6685506EB28743AFB83FF30E44CF6267E8
-FE0914D7B4A9C9C2330636C56BB4CD52D2833CEBD83EA61637BBF41C0BF08AD7
-387DF23DC75F13AD54721CF1A9386A84BDC1980FE4998B5A297AE3498D08E0BA
-924E25113BC5FE88D3316EC383C9E260EB61D38D6B49640AD8257A60C75B1A2A
-7CA2A772EF71F4949B7178589C81D305EF8869A8205054AB2673D5CB64FE32C7
-6FF9672F09B7DEACF2823A1B23C45512A7A2E4896C7461548838537A078F1885
-B126608255CEBE25F52C562155A5B90640C8B6982980CE33284B6269F9B47B7C
-BC36DA324446A1072C103F4CFCA3FA77305D3769C5DF6B6E1824F161C15304B7
-ECCF08EA28ED870166D92E632A4425C1B2068D400F06F9AB024ECD6E12F44BE7
-CA9AA284D05ACBE7A646CFE8246534B78B4731DBB548211903701BA3A4419A5B
-BD0CA123ADEF3F00DA55D5191818DA50E14B2EA1936A00B98E7EE25CFC4D6C47
-BA8082D5FB60ADFA921116B1532075B0D89A718618691938064436DFF80D8419
-4DA886E6A179CAC156ED240353B0D0ACD09BAB0DF497F0FD1519B2114EDB7EA2
-6E06B01B41D58B0FB4DE9DAB3CFB385878964D34E18527EEE63E4E67D2F021C6
-F345C7B86C986A273F2F85724FA1AC0D4F01A2818F669527B4F7C4848C853C69
-7595012200795AE5FDAE4EC035E225357B479507F656A0A7363AAA63A25DD43D
-CF21B547A0AEF7D31E285446BED4BBD0AB7422193CFC24239E226BC8FFABE2A4
-6EC93D06802367C00CE34D55F711EA84AD1342571F4DFBC9FEFA7B5CBDE00772
-5201AC28CA8C83CBA9F8F592AFD8BA2F2F467FF9EE0EA0E43D19F378A8766EC5
-4709FEC8F094BB070987987F7403462A6B1D0582B972A9F0D46C453447507B3F
-359C62BC9C64E4690588535134E8E68E8B94C762281AC0E7B1266AD38495465D
-0C4544A03AA5D7693F83E3FA56EA82E960FCAB253741BD624D611E9E0C43FE0C
-A57396FC732243CF7965AA0CAB191F919868EBC707801E5F00900398C9B9CA7E
-25954331FA0EA881D1E55908A3FECC6E372B777456DE3BD504BAEDE07CD9AD81
-94BE3E8EE60726804FB8DDEBE9FA4DDDB1499D738A5AE002CBD1235A538490EE
-CEAC7CF9EF9E87A0CBC9E03F4FAB4E58DE6C542A9A7F0186936023402E174C69
-7358B6C0A2CB341ACAB0400C20B9BC906CC95F49D5150A788CF20F76EDA1BF40
-6D870D59931A1E337C52F947BC90F1DD669E76983F184A3A968D122D38F5D1EA
-44A4BFC8312D3340B49AF1043D720AB9E3EC1BCF3CB7D5F95B9896C68568511B
-3D5775A6AD7C6C542FF59398D46B3E959BD3FE0E68B0B15536E700F14D38A11E
-9BF59495E741677A8D891E57F25E8136648A52C8F63F72BD18D3B623E91246DE
-3B8D68547991A8006F6F2CA33FDC8C15EC3EBE5DD7AB63A854A54B1B75ABF440
-3C4B3748BE559EEA512AAD36D12496A7EBCADA15AA4BD1737B66B4CDFE0C145D
-9DEE3DAF8821A56D5B87C74D59EEA862055BE507B0F52F92B853B8284099548C
-BB278419062BB42D312E21CB0EBBFAA86A0138CEFDC93AD84B3E99D538E93D53
-058B7E933F83C5E8F49CA3B24E297E33330FA5764E7FD604786CF1100FDBC805
-EB0AC996CAA65A721EE7951A8D60C5321BB59D58BF4E4A80B090C3B51B9A9CEE
-310A33E361A86376E9D73D7A369910621F1A8055A96A467C07B0080875B236A5
-7F484F244D1274FD78BC0F92920057F9B28D2FC3CDC33A8338FE59F9A36A45BE
-AFF7D142F6D7BD85E897944E355927D485137CDD6BBA975BC79841546793197A
-4F85E3E16C52DD2C3486C66C831B7FEEAFE27EF2872E2BDFB2E9D608EE446A55
-E6825680D37FD12C5CB28C56C519785DC093ACB3F45833E70AEB14FAAC38A175
-8CA46A885EE2EEA60FD75D5D2DE47FE93A5AFB038ED83F893A3C95E48914A32A
-ECAC1C1002945B67D050FBF52EF5EF457BE9875AE20AF5A7D65FF4480CC79C3B
-AC75DB49274C417D84357CEC0E6957CF136CF989EAB89C66D291A5F7204F7D27
-F5B2C382424289051CA8DC4C9D39106DFA228FF4A37BF81D2B85131EE0CDB584
-F901407126D93AFD59044688371A7463910B0D9E837E1930F1A6E00932578209
-DE37E80991C7CBA94C58E139C380C5666B95CC2ABB98C1E565080E4558B17414
-2698C0BFF2BB19F8242D2FAC477DDF94476E8521194137EEC48CBE3EA3273A98
-F52A6F7FE6DC4D0D7BDBDD6EDB27D57F64A1B875013FA66E9EE4D753F1F7C6C8
-0A5BEFC6014C267B7610F6CB45F2297A1DD9879AA3AD7B256642F0361C715783
-F6E05DC4CCD9A44CD46B5C7EF62AC7778691F9FC62D0107AEE4CCB4EC1744A73
-7C77EFE4E68DB87521F03950D86F7E234E75046701448C053C4B444F60704F67
-341D2A216CE8C2CDEBEE72576F99AEE3A9DCD7AEEC2E5A5D4D0F115198428640
-3D9FA864B6B2D055C3C69DCABDB887D87F2478BF07331CB8B4F064EE8D887E39
-8BFC975937B0886065CE556877E3F8106136478F7BA03F1100013B98DA37B223
-66198E09723407F5D45D09615E47A9C7E73BE0A7EAE4997245C920B509BCB0D4
-19962B5C80C36E28E925C25D3048B7C5130A79584DF9C5B288EA9BBF44AC5B76
-502327B822267484D85B770574458CDB3A27CA90A8C4F6A594100FC5B60C316D
-A1D5E4CE12772B8C82E853B9FBC3E21C399A1D04741A6CD5F5F85990B3C0DBD3
-0B953BB82B541E3E253528B938F36C2AA264D3905E1F8823AA20CF61DC0F3336
-B5FED7CC59A0AF08C729E046C25A79393142D052C4C7AEE72D65B395C71A2873
-5299FDFCEB32E426D20B5E7FE9D69946091EA88B558692B0A5E173959A5C0720
-C719117A25E1720A3DB0EFE48C9157ACC0CF76DE9AD3EFA3472847BA78B110A6
-1970B054248791ACA9F0414BCEBF55BFCFA558DA94A659E65CEF6F7CFEDAC132
-E135C9FC93AAD835EE281663A3975141ACD999CD67AB2D31D40FAD6642A8B7F9
-CCFDE9FA9A64B09AF0C757ADF4092676BA199EB6245907A73E515B2CEFDA7260
-68C3046863EFCA2A368DC0750BA5752BA2B79E06AF95FE00349151D9B4ED9237
-D0C4556A6C1336AED70E4C01B54D979087F922CBD091ED735A887621CE96BD26
-8FBB15079DA1A15FB2BA7C7F8A77633D745B0B0D8BDDD9C03ABEFC033FB9777E
-CFC5F36F5793A2CE592D227B94874AC1C4CD1AD78CD7177A927A269679D19292
-EF57844FF334792AB4C38E02FFD29AFAB6844AF3406E0AF0FE14BBCE9329767D
-E526492D447B244FAD3D4170EB91DD201776A48F094E0730F380C90740848438
-4046DBD4D4DF81932F3AC19A469443656ADFED686F62C6CD2E736AC68864C8D5
-F6F2BA70B164822534D421BD238B21750BDA28A05973A3CC777CD3B045EF8E8F
-98E2F1F62303FE1DDF1BBB207CED163ABCDEB6567A152F0B063406C5D66A7A2E
-ABAE5BB912AB95101831928B768AD841A00460A16B3CA8CC1DA84DEB336FEE7B
-A2238B06862C31579A4473D5C69FE5E7C755AA96D15417BF5DC5FB55F0B2C042
-0F8E3B35680FBDEB0C96D9DFE9F07819943FEC58570BFA44DB5196892D4BD43A
-6E8B75D9049C611807B04613B183DBB214F0DBAEA9DFA5C9F287635B38A7C450
-3566D873718C1901CB6C14E156C31D6AC4096F4797580AB8D8D4881926D4FC61
-557F24598BA2F430AC5CC81BF54004ACE43B8BD08B1DE280889411FBBE1D97D7
-22F533DBC59FEA2EE38E290260D6E1CCBE009E2C06DA95F1EDB2E78B5307DF23
-9C1C9E3DE538983959424EB29410DA800ABB20D898616388F29CE7CD7FB24FEB
-7080071F16F8874CD7E056258AD0F130396D7D4B53F29C5C5B385FF443BA9128
-B7CB9A7791AF8577009418E749ECF5A6F8378B2BEAF26AB6A13887C5E0B7713F
-C99A5829E14A60D1691F13F7BA4846647FB40BDD29866FC25845545A357C31B1
-E3CF3F3175173673FC5E9D91252156982BBB4C2839B25A5968A077FF76853A6B
-9D4AA67FE47D97251543940D3CC8D12A358DDA84AD7D28FC921057144A1F9390
-EC4A337AD7D2565B2A451375C2B9D75F4DC2F9E3EB43C7A5F5F10B99E522E55C
-3CF41EFE84FDD28A52BCA20238976DE24EC71BEDE4EC1E9FDA89E84F5D047E18
-7A6287C63A
+588AD80D9983CE7824DA30CEE5DC3114D69D7ACEC0758D8201805B82925EF213
+11A0DE01524197270E30BAE6F3C9CD656B69AA3249F41C2EDFDFC2578C6843F0
+4082A0F74969AF11796C8E84B3609BBF9D33AF93598CA7C66A838B58357AF67F
+347CADBF40934F52960E498188D3AD4444102B5F3B9E13F800C9834B31497AFF
+FE049ECC9879A3C97D78A136EC0FB343492C7DE3CDC79E2F698A01BB245D0730
+EAACA3AD6FD8E87E5884D0F3C0BE35260EF291E5D87940BEA66A05454E31F581
+6A2D9BB439829A804934F86D8715E9D9293C22D7EC8CC4B9D26BD7228A6B3E02
+4A3CD1FD138AD31954A654740B42B94060C3FAE9F2E95DEC9E0D6D7512BB9444
+7A18A557840F57627ABE113EB08E2EF55F615461C79EAA63954EB129130567B2
+D99AD830E56A5337489DC6C52CF3116FB0714AA272EAFCE0615D4E29A0A3F5A2
+E7140978DD44A5C69D102D5F2108FAA5BE77A1CA20009954562FC12698A99EE4
+C0008D177A0E0780E8B6C4A36A564872DC538F59760F1CAACF615469C9087BC4
+A73FCCC86B80EE69E6490A99DC0FB667023B270B3273D60E661DC76AF2AB48FA
+6CF21B39E96F734CEE1F81FCD0EEC47E47816F157EA8D75AFE065EB866CEF278
+A88178B047F069218677369DF101FF6EDE143708E6D8B9B187ED841637FB825A
+5CFD7D0BA1A6FECDA0936080BBA33008D5C7E6D57D5DE8865CF64CDE12803375
+63DD792FFA079119C76E4811D064E3B893B358B7F1A67D3B15FE747CC220C512
+7227309A5B0E0988ACB22B9D18FFB368129CEFB1FF53E9729DF751BDBE47F443
+C6C99C6277288DDA1B7DE5645E31D2F54D5F930382B487445C930EB7071C9573
+26BCAC527FE2D2D597D22C6FFAF8CFC9A61EDB3DA8AE4397C0C0168F3C8BE8E1
+9164EAF08A91AA2437F5EE3CB02C7CBCB083D620172ECB93BAAF9E009C27E1D1
+0B02F3ABB85F2F105D73820465F653721063E3EDB736F6C2A46F81048E02A857
+462C9608320526539EEA194F1856B9FB8CC80531D9BD7D494DD90793CEE53BF9
+BD431ED5C15A3F5A186000F9AA6D83004B53E6692959B4F721AE5BB2069E3946
+D5577DDF1FE4C883FBF478970378D3292DDAA426305A2B366CF673A636C7A332
+92A3DF8254BF6D9FCD58E5DDDBBB12E5A1D2A1AB1F34DD295830F2A3F531CB78
+4C3511A7D79B5DD17626EFE0E476E146441455DCE7B9E5C6E24B099164AF8526
+48F9ECC20D963EE6BB7B30FFD3D2F93659CBD1C3F41BC1A10E7556D6E9C9D9E4
+9AC62A1417953173163DA8A1714D8D6D030927DAF814E31CA14425EF789B57EA
+C1E655A3BD6C46C4E4C74BA0D4E2890EB44B57539A76E2817C7A3A05BC099D4F
+FDF639606F5389B48FB7B2B27ACD26D6C0AB476B576FA3AD7E8A2B90EE2DABEE
+FA6C71A3BB7DBDAFA0590C0867A7B3519AEC7A88FCBD14BCF6FF71C21B8B824F
+C97617D80CAC134FD7F16B3ACCBECE31B1F2A4E7EF8641CE8539D370F6318035
+F10304B6FA3FF47B4AFA1F77C2DF7E863C23FC8877A0A626AE42BB4CBE708825
+AF5524DE49869CB408253EB64C1F793EA70207E7F18C44BAEE3FBA4097E69C89
+C571C34AD0896E3A08A3C4834ACCDD6D0191481A472247E2B4FA76527893A1E7
+32982BFD8FF3ACB2DFAD7E359513667AAF8D64A0A8538AA9AC58E5E2742878D4
+C47C9E9F74FC134D0C307904DD7100207DADC681B6EDE399EED305E32F427599
+AE414B770FB1BB49ADAD8D9FC4B5BAA4C4F01157C763198BD945BCE6C18755C5
+552A787790674AA407AEDBBFE51FE43F504BABC4C2EA2E08910A2E1B98C9FA11
+970134EA436C92BE95625A98F125CC767EA00C3B914F5335A1094EC8A7BE9F53
+F058D3C5A2ACD23A106F38247A1066AFD13942726D4C67B851F3FE91B93CE5B6
+15B556DAD06D10740DA08394D827331F504EB3401E17D3D4E0019ECA9FE7AC3B
+4C259407F93F1DA6521E1DC9FD4F996FD646A68F636CC5A6453E41DF5DC6ABC0
+2F946BCE0C4C5036B68680EED074E5770EF95BBB46EDB6E3DDE5800F6E0B88FD
+78E21751166464ACA5B7ED356F4B2BE74698872E2C791996FF364035BAFDCC15
+0290B469E3B8C929DE61CD12E4A1517E5ACBA9700BB0516E19AB997942147C76
+3CCA2DAD3882A9F937918D8F501EFABB8A578495EC78F015735EB4B17B24586A
+707B6220120B2EC9F51F8D8C6E17E895EABBD8D2C10FBFA6893F632306EF5D0B
+FCB8BCE48FC54D9C8EAE7B44675E4E7C1A5175DD2C3E6DDB13A54F4EBA618104
+12A18B6EE1DA922F9A7657F01C4FCF77C9A39FF671EADF16C961D525F3BED021
+506CD6872712B154A897BBDCA877A3EC36006AE0727C8AE9CADC0986DAFA6197
+51C6CDDD926B769B4D4E78A60498912E0076CCFB185DDD157C23C99EFC81DAAD
+DB4594666031E8B2AECB4B8C45B635B6BC5136E12838D8ABA323F0CE5F77137D
+6D996DB754DF8B1F5F863E88017EE81AF20DC0E577C4703D33D8D30335D12A3A
+43E0A60ED40490E1C17C56C8E0D8F85DEB830EE3376B50D79A7308702FC73FE0
+F687CE591A6BD165ADD468A91FA956F0896CD71280DD6ED9DCDEDC2A874B2FF8
+54A04850C55D6EF0510A57F4A92D3FB1CFB342B5EE8818A4C57B76A86B78BBEE
+94878BDBA7EA4695638C6CDA81B2DADB67F127518C61661CB25CFB241F483921
+FEE3C8B2780D3BFD3DEF7C1DD1E2E495FC2779E79AA42E691BCFBE6A179220D8
+2568A1D5CFE865D816C7DFE09525023178252D091D2176A7765A225B7A58F5E6
+31643A1F7F290793B04EDF45555F87C244802ED2F052A6B7AED10CE97B25C4D9
+689928AAC1D6359A9771D2BF145F3D8F7A5F96FCC2528F1F61ACB5EEA83C8CB5
+C8D77EA6E47460F507EAB77C41133F4CC8A7DEA55F4AA4B1D7CB79FB658DA6C8
+127E35F12C842DA381AFDA65DECF59D64CDE61D8E847CAEF1EC5D68642972D83
+35C44EAF0E96216490E3C2270FA07E38458F9A7C645C7A24AAB545459AAD739B
+6AF97F05A4BD6427E3CCC63CEC883D418604400A2D49BDEE8A05790CC79EED98
+7E1DDE7AC60E58F5905C469481C3DF3C2BBCFDBE9EE38CEBE242A4C89E73C8D0
+37618DF331E3D4ABED1F8478938BAE12DA99E1898782FD189A316FF97E71FB7B
+1D0C838B0379D8B288E3FEEFB3B5CF9E0EA17F4C46035E71208708F145A868DA
+6461FABC50816A6346A99025D0D5BE62C422309D0E38B1B57010D00BE0D37C04
+4B7811EB21242DCFF99531A7238A92DD539C57B37D57AF4F4DCC381BA2C116AA
+06E4C75AD3AFCFC79A51EDAD3680FE6AD3B84281109784BECCEE46BFFDDD2B0B
+175DC3A53E601519DA6E563E1D0938076626A851B60228E7AE1CAAA8309112B0
+1AE15047B51274ABE098001C02F97A9F7732B60280310BC1C77E3E437CC8B387
+257F33990F628292CCE5C0CBF9C0ED69391F1EB7ACBC5CE67897B60262F43104
+83A1AD89E1DE110119E0579462C478D3C96B134475D756905213654D63A25EFC
+8DD8E296C7C9822DF33EC0C37B6855A725957AE4BA59683B696471AE8006E20F
+99CB006D2871686D3F8061125B7479A0B7616ECA5AD312EA374CD3E626A3D84F
+4E321E2DB5754E31AF7C7007376F1AD295714B63ACB429D223AA7992B19798A6
+FBFAAC81F88E8FD4387026702070ABABB5C2619C99914FDE91423582F7A44173
+FD078B76F465E95060F3940BA6BE3F0D70D409B1335B671B4D0DD215C4F3E448
+C63FB9B6E3BBD2AE57CFAFC32F0C77D0D1EEB60FF42BA792B4B31D7738EE9EA5
+CFFB7CB2E9159C19EE968902ED797394D2CCA5819B69B9C929A1B3EE02AA64E0
+6B5CD5C75DD43FF3BA066DB8AC30580E839340568B8817F3390E1EAE183AA414
+17C39793EA81A0D3A41FAE03CBD0CBCF30B5AC1BC274D39046E1C9CBBA2DF6A2
+A9B2D05C754E5C7A561FE48BE039582E59D2662BAB5C70A2E604B3B12DABFF72
+F3544E789BDA8AA51758CF5C443DC40ECCAA7B90C79C76EFAEC0D914D82B46F0
+6192E669A054F9E7622BEDDF44623EC6B345D266F7B82003791B0116CF20BB26
+ECB0A3270DEC2E091AA64839AC2E2F3CF07C98F4259F38343D1B40D59221B570
+7CDAD49925EA04CF3313BC397F07C4FA88073EF9108B41379FE253E422F864DB
+4BA47CFF023329ECD166387B28B621D325901D52ADE7F7A88332120E1A70283D
+E904915349C01871C8A747B85A2953A82F93B137C75D4AD7E79BAF7886AA47AC
+2812C8464184AA44460BCAA5873ADF4306F7760CE9BA9246F450EF85279E1E61
+5CD9A6DB43EBCE8CFD8600349FB10E21331EFD113010D5F72C5496456F1DBAC2
+67FE71CF6A894F3FBD00C06EA7987D139575F362E3F2AEE1CA23B9C48D3467B3
+0BEA687B560A80006B985ABF70F876371D97492F89AD4A75350EA8B274CA65CB
+0962DE31D0A25F0EE8DC26FCA7AC4E3ED964FB64577E14E8BA83128C841C1AF3
+D9124FDD0EF2F532853CB4016188E93786428B0EFB77A1693CA03CE55CC50B00
+11DF451676C7B1A5B0E6D32EE76AC04CD3C23E53E146B192BB5992C1C28F9839
+95A0FF1E9F65FAFAE936023DDAEEDD59AC2F8E23F43838C28AD64C92A1E22AA9
+7206F686EA2214A9C6B8C72AF17632CA609A400E1612B5F09C077553CF9A06BA
+519E7BD8081B94D30EE5DD470CC9641A2BA412EC80FDC2A3D643812420D1A9B3
+5E3AA02A59297D99819B60473ABC13910A4248B870D48454DAC2FC609C5CA2C5
+6295B4B300BFDF1DBE1EB32B023C72A3620A837ED953020F01505BDD72439167
+DB676D7B928CB0D72C4400D6BD45189C822CBBC9EAF3577BFD08963D8F56CBAA
+58C48C426F61B5FB68F9B345ECA6B823009868E5770701E59D9008A9D2518ED4
+20DD45DC6A75F1C731D2EBE5CFFA71522885266B7F8868AEE1F950B2371678C9
+6D68D9AB0F46C9F9C53D76052AF52E6796B6406C21C348AA80D621D59882F326
+B8278FF5793CCAEA19C9FAAACF0EAA1674852BBD743D4228182FD2C57A848A48
+AE90677E8F78A6D7C05852C7FA2CBADB0335B5629A063AA4EE2015F75D4B3901
+54BAC73F18A56E594953392580EF185E4858F6988068B4F20612EF86A876D7AB
+138640CB81DDD4CE7C3122794F790BC4C28ED57DA2436F0EAE237FCA17FB74EA
+D32CCB0D6049642A9F1F4DE4A7FD3FC69DA115651729B8AC9579273B2D52E92C
+84AC2753C8AD938980FC6154157A9B6F16FCE4F164A7DB9B16F802AFDAF03905
+A27357A8437CA3C58AE04B7E6BBC5B7E977DE332E8BDEEC28816D620AE68DF6C
+8FEF700786881F71458CD14274C650AE40B6651E4B8CBAB438710CF1BF95CA36
+FC790D25AF295BD82FE7BE46D3F24F085EF14078BA735EB74E12F5C7ED32BD0B
+C352FD53A1C005AC06228A7BA720B6F4C4F646F78D31CF68D7EBF795C0239CCE
+BADF807DC5D67FBACA127792AC75A62F6F1F73D64AD54698343FDBA46E119F65
+6EAFEDB71B82C87DE2F8E52A2CA8F3866194E33DDBDE6CD7CE5A2048CB0069DC
+1D9B113C6F07BB27D4ACBFA9CA4C48BB3E1016BC0D0C1A244C9AA3F5775788BB
+1377B33F943759911292027D59926FFA8D2E0B42F13174C86CCC5E85DF8F690B
+C0213190B267233C97E8A00A1FEC4036D127B851B280229910447A003A6E177C
+09297A546D094EF676D79A143EF41AF32EA18FCED33E0333A269C1F415492EC3
+1030F2E5FEEA8DD4D3E4BFB2B2C3C52BD6A9A793024B8A4C922CD5EA88844521
+BF1655F0C60F26AFCC5BF249D3D526D58E9AFFF6644BF3CC63C1E34DC78F5DB5
+7EA60D5E9336082488EBE32ADA4C72398F41AB65B3D2A66873B5B21E15A373A1
+19C9DAB008F9019D4F75950F6FDCF08295A0288840F8D2C9D0D2564CF3281B46
+0D207F31673D32E7AF947C98BDFA5A0F103B9F9294522F75C1F77DF139C557C6
+8F2FBFB745FAD1F7A7D4DC44AE0059E087118A649E20D8C8C195C3D53702712E
+DEC4FB500BABBDC6F7CFA9404D7304B8B6075653C135C67535231BDC50497F82
+87A83FCD548EDE01BAC21533CD0B9580963B0D917634416CF73C8E63E8BAED61
+AC2E035C77E4F7F57BC5F6DDFBD78BEC5C63F1081CE70B28D93622A728264632
+5619E5CAEA299F82A893FA869A6109DF69CA925007F6581B4FAA7B1ABC13EA75
+A3880836F02B2CF4BB74B6EB89958205CDB5046CD44C64D37CE6C3D6D22C5DA8
+52474E899FE968F1EB87F9F6E9EB2BC293052001FFA845E135E1607CC9544197
+8F85CFD6203C8F85CD747D78328773442B66D34DE4BF167037C8AD551EEC6330
+C2FE9A866EE43C13A866FD060BA2FE71AF820ACD116E7403098336D2D6186562
+8E8A4D2389A2BAEC96021F8E53B2F819DA1834DB4926B4A28A65C4FA045AE35A
+1C1660F7C3887B418155DB104A5B4C9C357A910235C4796495E70EE20F27F1EB
+B820BC1812BDBA2BC603459D531D3F80001F33A97D4784AFA78490EA731A914C
+35E7E4B13263098E67A5A229A10DA5DA4B9C7967D65F084FC415D4562E7881CF
+F96A2A19E763DB025EC53E9772BEE1FE029AABEBB6A0C63A767941E507194460
+8BD86D66F029ABAA469B29211365FC06D76C9DE48C76656C9EFCE9DEC40A8CD0
+0325DACC7595CC4537647A8D2BE41E9B65761407481A8B95E7497C4AEE88ABAB
+62F14DA187156A45ABB26AE4B390E6B5BE999105EF6247B1CC1CFA1F67F53023
+4CC99831C018D021BFEED1A6E2DA1E22334EDB644B0452C24806D4A6C55D3244
+C9EC8D98BF765CE83DC44C5B507F7A2021DD90535D6C8189CCDE80F34A803E32
+9235759A6AF46652DC3D0929139CCAA9A4AD33B01FF0D0E384EB4B4FB8C5627E
+90A4A9BFE5BFC56D07C663C510C6E68F3D573BBDA27A0A5F87FB039CE742CE97
+E6F839579FA56E97DBC48802836942118E631C2A6722F26B1796EE244394191D
+B4794E467EF290D47D1EDE37F05C99CF4B6B107C23751402CC93D65AD7713C86
+7855D3D5903D85D3CAD3D399B9B1D6F82E9236FDD7D0C1E8768541F5D71E4FF7
+3B2627BCCA0ED0987B683DC08AEDECEC99D5ABF9002E0DB6B96F986D087097C6
+A37C7B438474736F4C302D9F96316787E623FD7C5870B0722CA503302E0D1CAB
+E0112744ABA7A4BB6EA13871EE4378DD71E6928AC777E4F8D3A79DAEB764F547
+F63030E8485A3AEF2E16205305AD3D41856413B84BF9444C58B94AD2DFEC4E0C
+C5DC6E3BC86524E6E8FA3A8F736FD528F3B4C2CBFC68D08FA4BE45E87D942E18
+1D7AB745D7BF40C8DD957887A6F196558053F1E9A66A3004D844F468AE2020B7
+C732682CD4CBEAF96D1DFA0CD7A5340B243512E01A785C318AB7FD86084A3466
+D5CFA597BB028840A94E03C0CB34656030E7A6EEAD68C5C33E9C7F4AAA07620D
+970BF9377CF44B224E59B117CFE78AE5C73681B87415CC03C63295B857DA0168
+8E815302A1175839A1BCBEDFBE1EB8BC0B86CEC817361892F6E0A26F7290E44F
+7CB4191B53D844EF577632A6C4B71C23C965754C021059E1066C106252B0A333
+E70DE9E1536E25F45F92E88139D38D8B37E839A2F38A5641797AAA9A33EDFB9F
+6703CA0490BBD846AFD3FFA514F00474C42E5637AAFD232199A754288F86F223
+8D9584DFACF5CCD498F4D525836F026C2C4EAAE67985A1D0E1F9932E47265A66
+74B02FC39F8C576B45BE94363269DCAF4E999106BF1E91CA01B735C859CB3B5B
+D4CA139D05ABFA22E943F437FE85F093921C1A7351A885F78FAAA347C777B640
+1E8B17D3405244F338B86EEC118D8BA59CA6EC06DF32B379B95B989DC6AA7035
+C51D0A6D55202155F91DC63C76168C323AC4F396BD0E254686E20F9C5BB4A184
+0092CB9A16C8928DDB70E3D4568B18BA613A32D8AF9934C64AE3ADF6A4683FB8
+EB6B330D1C9D65998CC12DE9BD75C5AEFE96AD6218FCE6831B29FBBDCFB006A2
+087A6A7A55799B74FAA02C1EF6EF22FD2F208521F6045A2A502B26F63A0DF8E8
+4749A7E80072CC9B0482AA2C5D05FEF9D396B443F4223C2E31448E0CD3A81A2C
+75260B7C95A71A4F82230A7E5EB2B7BD479EE5C4FC99FBE5B838B40284F1ACC6
+E0A2EEF1CCC917D7A954F1C62FADBAE79802BB00D9F09495F66C1C71FFDE6C35
+7B5F92AC39F5B5CD3BD36AA6625C49CDE8FDE42BF886977994D9521430372694
+F022E3573B47F1FD82D02AE54915177DCCF0A28C8F46FAD69F6F42A30714966E
+A31210E7C7DA5EFB12BBD346B6E2CC54B1AA68D6A36CD1ACFC22422E2C69C284
+FD474CADF22996095252D28D2B7C4DC2E3DC8302E56A1B2C45865E5FC0F30678
+DCD5F5F5BBD4A7CA6C5CE3E6012CEFE13A0BF35EC3687FD33606C80D7086D6E9
+09F85374D9FD4FB4075C41B3B8B2DA592DFB8A45BB0840C52F8C1B557BCC5F6D
+D7C48622E8E05A7C1AFFBFE18F847D8D719D7F6F0676F36D788B9ACC730D1E22
+D9935BE4D12BF0AA8A28BCFAF2605F5B92CF33C2C29642466BBAAD49897814BF
+01B48B4F585FA34C035075FE81FFAF0A11CCEF4FC0A8312DBC3FFBDE5D0BE3D9
+A0F14A4346E5B6AF1B248BB9D2922B01A0310F26664F4C4D7CFFF42C23743F5C
+EDF8398F6B56683E8637522FC01FA23E1D90BA6AC0AFFD2154DBAB660C3D8D50
+165C52ED71893C1E5DCFC0E8A16F0587CFBB560F7A36D2E8FADD4B51601F8EE7
+D302202266555F4C2B9DECDBB9139C8477A5F920A9EAC268FCC4B6F0F5221CD9
+66E7A162F2EDE869EADF43F3426BB5187A3C56C98F4C8E318A91CAC3EB5E8A81
+F70911F3108DD1829E1477D8140908A63DDC188A153AD6FFF9EDF25803956AA8
+2EAE342EE5B6D742DCB6ACD0B395F1191BAEFE6B4ABCFC545D63CA5C4A93B084
+CBCE8F11B0FDAB1F5E905C0FD81977C38A605261283D51170E16074300E0ED6C
+71CCDC3947C6EAD9EB08A0C8B0E376313FF292B2798DF74E24FB1CB97DA468C3
+D5471B8986210C6C918D2EBBD2AF1481B45AA80052BEED303A3C4F62BF61C51C
+16C7B5DA640355CF9E965C98B4589DCE64DBFA471A9D1E2CC595C1C4FB1E9C24
+A79C182D29BE20EFE708336ED99C099B73C2C6CD76E33CBC5CBCF9F8FC9D582B
+A5146793C6023A6D348341F3FE4DEEA24F383250DE926415813A4D5CFF0AC0F7
+0859E06EEFFCA4512763389D30F61B78D55E2029A6C434D4C6AE34FF9B842D08
+F6D9D80202A1943F7426176477151D79AFE2B04B18B862B4479ACD9A574E6F03
+300CAF6FD06088D434A4A8C4E82EF62F8C9FF511814CB612B7703045257C0E81
+B6E3BE158716443CD8A1B0CC9C3DEBB7A7209D419C8B4D0D9505E4EB803105CE
+F13164AD59435D3492E97A453E2C4C20926AD28C68F077214F792B8A53AD65DF
+9C64C0A6C5D738090FB9A9DFD5E815E463C4A910320E562611482C2499691F70
+0729920028EEC50510D86996E1992D206D9DB4154A2789E2FECB006698DCA0D4
+D9D2249F637BB1EAF1392AFC4B15F5204507517F33BFEB755A6FD123C7286C84
+147BDE88B7F2D1C30F5407072EAB1FC57298944B1DB8E484C7A00E507E02CA60
+B2FBD8B4D2C90D335482095104259790C1D0B30761CB51076F70B1FFB11C8ABE
+7D2CF73B39F62D7A89CBC61042AE125557492E71D42CCB9938EA30E4FB54D79B
+B231AB1EB11A165337E3D60F7432F99F7751F8154C88F987CA373FA3D8F53396
+EBC264FF06328ED4363A7B8DEA823AEE38764E9C4374431F695B48443D769B39
+1C70BAB440701C09EF3DC1982A6B9ED93A743055D3368535DE62389DF77A91FD
+843137AF92277CADB3656E89888D04E83051053BBE60501D44BCA52F588F7094
+B2BE919A6E1A5E871BFC66E9AC5426385381C92F061E495422A9EDAFC3550E04
+FBD39AD669FBA58E27861F5F8EEB68FA6CF43836FC89CEDF8A7F0C40C4D9AB46
+32CAC6E577206C6C96BEB49E034C9CFF6D93AE38D943E8733532B2611482D303
+F26CF863FEB1B2EA26907B140EFB1F006943F7F8BB0407C9277EF8054B7E4B21
+42DF8D189D4666CD18D7B2CD055E3F308F542B8DFE44191497589916E047D772
+3A49FAE265259300BA758E9E4AA929897FB1A3064341F50BFCB1BA941C63D2A5
+4F1D1B6F3A9469C40095143D239FBD8800390C9692D85743FDBD0236D53FE564
+3025657538DFE905B4266C6DA9861D62CCBA71773717D432A968A67624305DF1
+CA737DC9141E2B53001EA5FB230131FD58B6AED2122FA73386FEE56F6A00BE39
+88DCD9AC72D1EE3BA65845B211F50B6564FDFDAB5D700A503A4A1C56CF4D6FE4
+6A59D07DE72398CD024D77A167B96690F747078CB33BEFD96046E62F1EA3F232
+7249AFD6890C0618BAF6AC5CF5A331E7A17BF5112F015C7E32118633F54FB9B8
+9B630DCDE24CD3D8DB648FF875B6F5AB697725DD0AB985EB96CA5E4C38953385
+DBEB1F869A464B95672983AA464FA8EFE6AE5D66CFB3FB9BBBC8E76DF097A290
+70318DC19C92E6E52DD66A90C1490FCFC269313380666A5E1BE866F29A52DFCF
+1E4CD96E228D709D2A247268693100A6BEA47D46A991BEBC17B4923CE260DDCB
+CA8CF0E2A7702CFCE34B6B4C84ACB3619505E83CB15A00ADBEFB85AF76459D99
+4F13F5387C45E4A7B3545F940AF5B530CFB4B87EC62182D928B2346952A9181C
+874E562B861CBD21650CE8D45B69D57FACBB65633E5922B2421DE294C678CD1A
+A96FCBD57755BFE286B2CB859E7306FCA8D5A5647DD75CA4C88F650066682EF3
+1AAD5E5075950ACB0E6213E049747D50292FF681FA9BC10046A50A24A4343830
+F6383D5C01CCBC45B639E3E77408DAF3FFA2AC38FEEAE066E589ED2558B7233F
+46CDF10B9AB854585BE0EC1EE999AD024616AEBF8BFBC7B62FB4E61CE39FA982
+B49F014291DFB82CC597FC4458E147C7D1F35A85F43710A7C8ECA4E75297F670
+BC84DA0007590C97F264761F2442D0BFF36CDD7CBEE8309ED328F9382E888CBB
+BC797D5009C40EA7244274C38C9ED0A68D2BB5DDA1868EDBDCD77AE2AA177B41
+C0B4189AB13F26541CA0A85C45AC4264AE799D15383CA4570A72F52882EB0529
+0566FCDE2781C4F803C7530D9DDB092E9427AC9F81704A7CDA0FD244ED869732
+FAFBB1F33A02A72735AD8A0E7E9E2715825B06E5AAB07B534838C55C706E4FA6
+122335A37B18C23EF0413E80DAF87D5FC227F2284DCC2F4F210F0CF399F91263
+E493F59995500395B8636EC3800016729E7AD8F128A1915DFC887592D5D50171
+CF398265E5F0EF52603EB59188255546B58D8BA2702E76D99587172472DF09C5
+3CAA541B2B700FB971AC9EB89276D6040A110985883E8C846BB8A987BDD23CBD
+5D3DE231A8E3FC7F34A645E14C9769608AD78DA48989FD071CBB4C16ECCA8A85
+4E7414C4BE33376A747F00EC9DA3FCE5FBCBF3D11C9286F338C39009E45DA5EB
+00A574619492AB9251FE1D4927AB873CDA6FE918E84E71868D7D7144E04C49AA
+245831781F7F649174415B02D8557C9ED894096235F73E65DE886969D6BFA347
+A2883CB8FA9076051FF73D2355F0E6EA80
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -2374,10 +2379,10 @@ TeXDict begin 55387786 39139632 1000 600 600 (de-refcard.dvi)
 /Fc 242[61 13[{}1 49.8132 /CMSY6 rf /Fd 128[30 4[27 32
 1[43 32 34 24 24 24 1[34 30 34 50 18 32 1[18 34 30 19
 27 34 27 34 30 10[45 45 1[34 44 3[45 54 1[46 1[22 45
-47 39 41 1[43 42 45 10[30 30 1[30 30 30 30 1[18 21 18
-31[35 12[{}49 49.8132 /CMR6 rf /Fe 128[41 4[36 1[43 59
-43 45 32 32 34 1[45 41 45 68 23 43 1[23 45 41 25 37 45
-36 45 40 6[50 2[84 2[57 45 2[55 3[49 5[51 53 62 1[58
+47 39 41 1[43 42 45 9[30 30 30 1[30 30 30 30 1[18 21
+18 31[35 12[{}50 49.8132 /CMR6 rf /Fe 128[41 4[36 1[43
+59 43 45 32 32 34 1[45 41 45 68 23 43 1[23 45 41 25 37
+45 36 45 40 6[50 2[84 2[57 45 2[55 3[49 5[51 53 62 1[58
 61 18[23 27 32[45 47 11[{}39 66.4176 /CMBX8 rf /Ff 130[35
 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 2[35
@@ -2468,7 +2473,7 @@ y(uc)n(k)n(en)f(v)n(on)g Ff(C-s)g Fh(o)r(der)g Ff(C-r)g
 Fh(suc)n(h)n(t)g(w)n(eitere)g(T)-6 b(re\013er.)-294 3983
 y(W)g(enn)18 b(Emacs)f(suc)n(h)n(t,)h(un)n(terbric)n(h)n(t)g
 Ff(C-g)g Fh(n)n(ur)e(die)h(jew)n(eils)g(letzte)h(Suc)n(he.)-341
-4254 y Fd(c)-357 4256 y Fc(\015)i Fd(2006)j(F)-5 b(ree)21
+4254 y Fd(c)-357 4256 y Fc(\015)i Fd(2007)j(F)-5 b(ree)21
 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)g(Bedingungen)h(auf)g
 (der)f(R)1331 4259 y(\177)1329 4256 y(uc)n(kseite.)h(v2.3)1902
 -421 y Fg(Cursor-Bew)m(egung)1902 -270 y Fe(T)-7 b(extteile)2244
@@ -2812,7 +2817,7 @@ Fh(gibt)e(an,)f(wie)g(die)g(Argumen)n(te)4098 3413 y(gelesen)d(w)n
 3493 y(ur)f(n)4273 3496 y(\177)4273 3493 y(ahere)i(Details)e(geb)r(en)i
 (Sie)f Ff(C-h)36 b(f)g(interactive)26 b Fh(ein.)4391
 3661 y Fd(Cop)n(yrigh)n(t)4694 3659 y(c)4677 3661 y Fc(\015)21
-b Fd(2006)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
+b Fd(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
 b(Inc.)4549 3725 y(v2.3)h(f)4701 3728 y(\177)4699 3725
 y(ur)g(GNU)f(Emacs)h(V)-5 b(ersion)21 b(22,)g(2006)4657
 3788 y(en)n(t)n(w)n(orfen)i(v)n(on)e(Stephen)f(Gildea)4098
diff --git a/etc/de-refcard.tex b/etc/de-refcard.tex
index 7e0df6e378b..94f9bf0dc47 100644
--- a/etc/de-refcard.tex
+++ b/etc/de-refcard.tex
@@ -23,8 +23,8 @@
 \mdqoff               % deactivates the "-char
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 2000, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 2000, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -73,7 +73,9 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.3}
-\def\year{2006}
+\def\versionyear{2006}          % latest update
+\def\versionemacs{22}
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -81,7 +83,8 @@
 
 \def\copyrightnotice{\vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} f\"ur GNU Emacs Version 22, \year}
+\centerline{v\versionnumber{} f\"ur GNU Emacs Version \versionemacs,
+  \versionyear}
 \centerline{entworfen von Stephen Gildea}
 % \centerline{deutsche \"Ubersetzung von Sven Joachim}
 
@@ -275,11 +278,11 @@ Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 
 \title{Referenzkarte zu GNU Emacs}
 
-\centerline{(f\"ur Version 22)}
+\centerline{(f\"ur Version \versionemacs)}
 
 \section{Emacs starten}
 
-Um GNU Emacs 22 zu starten, geben Sie \kbd{emacs} ein.
+Um GNU Emacs \versionemacs{} zu starten, geben Sie \kbd{emacs} ein.
 
 % Um eine Datei f\"urs Editieren zu laden, lesen Sie unten weiter.
 
diff --git a/etc/dired-ref.tex b/etc/dired-ref.tex
index ce4150e1df7..2f5c392ce1c 100644
--- a/etc/dired-ref.tex
+++ b/etc/dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
 % Copyright (C) 2000, 2001, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -41,8 +41,8 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2006}
-\def\version{May \year\ v\versionnumber}
+\def\year{2007}                 % latest copyright year
+\def\version{May 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/edt-user.doc b/etc/edt-user.doc
index bd130e2f5df..c99bb83a364 100644
--- a/etc/edt-user.doc
+++ b/etc/edt-user.doc
@@ -2,8 +2,8 @@ File:  edt-user.doc  ---  EDT Emulation User Instructions
 
                                 For GNU Emacs 19
 
-Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+Copyright (C) 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
 Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
@@ -823,7 +823,8 @@ G-C-\: Split Window                     |  FNDNXT  |   Yank   |   CUT    |
 ;;;
 ;;;                      For GNU Emacs 19 and Above
 ;;;
-;; Copyright (C) 1986, 1992, 1993, 2000 Free Software Foundation, Inc.
+;; Copyright (C) 1986, 1992, 1993, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <kgallagh@spd.dsccc.com>
 ;; Maintainer: Kevin Gallagher <kgallagh@spd.dsccc.com>
diff --git a/etc/emacs-buffer.gdb b/etc/emacs-buffer.gdb
index 7b5f2e51a4d..6a6a73ca0b6 100644
--- a/etc/emacs-buffer.gdb
+++ b/etc/emacs-buffer.gdb
@@ -1,6 +1,6 @@
 # emacs-buffer.gdb --- gdb macros for recovering buffers from emacs coredumps
 
-# Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # Maintainer: Noah Friedman <friedman@splode.com>
 # Status: Works with Emacs 22.0.51.1 (prerelease) as of 2006-01-12.
diff --git a/etc/emacs.1 b/etc/emacs.1
index ed9de22bf33..4ebcd7c632c 100644
--- a/etc/emacs.1
+++ b/etc/emacs.1
@@ -1,5 +1,5 @@
 .\" Copyright (C) 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-.\"   2005, 2006 Free Software Foundation, Inc.
+.\"   2005, 2006, 2007 Free Software Foundation, Inc.
 .\"
 .\" This file is part of GNU Emacs.
 .\"
@@ -431,7 +431,7 @@ make and distribute copies of the Emacs manual.  The TeX source to the
 manual is also included in the Emacs source distribution.
 .PP
 .SH FILES
-/usr/local/info - files for the Info documentation browser
+/usr/local/share/info - files for the Info documentation browser
 (a subsystem of Emacs) to refer to.  Currently not much of Unix
 is documented here, but the complete text of the Emacs reference
 manual is included in a convenient tree structured form.
@@ -470,8 +470,7 @@ of one file by two users.
 .\" STOP DELETING HERE IF YOU'RE NOT USING X
 .PP
 .SH BUGS
-There is a mailing list, bug-gnu-emacs@prep.ai.mit.edu on the internet
-(ucbvax!prep.ai.mit.edu!bug-gnu-emacs on UUCPnet), for reporting Emacs
+There is a mailing list, bug-gnu-emacs@gnu.org, for reporting Emacs
 bugs and fixes.  But before reporting something as a bug, please try
 to be sure that it really is a bug, not a misunderstanding or a
 deliberate feature.  We ask you to read the section ``Reporting Emacs
@@ -485,9 +484,7 @@ For personal assistance, look in the SERVICE file (see above) for
 a list of people who offer it.
 
 Please do not send anything but bug reports to this mailing list.
-Send requests to be added to mailing lists to the special list
-info-gnu-emacs-request@prep.ai.mit.edu (or the corresponding UUCP
-address).  For more information about Emacs mailing lists, see the
+For more information about Emacs mailing lists, see the
 file /usr/local/emacs/etc/MAILINGLISTS.  Bugs tend actually to be
 fixed if they can be isolated, so it is in your interest to report
 them in such a way that they can be easily reproduced.
@@ -537,7 +534,7 @@ Copyright
 .if t \(co
 .if n (c)
 1995, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+      2006, 2007 Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/emacs.bash b/etc/emacs.bash
index c482e82b361..2589c784a87 100644
--- a/etc/emacs.bash
+++ b/etc/emacs.bash
@@ -1,17 +1,41 @@
-# This defines a bash command named `edit' which contacts/resumes an
-# existing emacs or starts a new one if none exists.
-#
-# One way or another, any arguments are passed to emacs to specify files
-# (provided you have loaded `resume.el').
-#
-# This function assumes the emacs program is named `emacs' and is somewhere
-# in your load path.  If either of these is not true, the most portable
-# (and convenient) thing to do is to make an alias called emacs which
-# refers to the real program, e.g.
-#
-#        alias emacs=/usr/local/bin/gemacs
-#
-# Written by Noah Friedman.
+### emacs.bash --- contact/resume an existing Emacs, or start a new one
+
+## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+##   Free Software Foundation, Inc.
+
+## Author: Noah Friedman
+
+## This file is part of GNU Emacs.
+
+## GNU Emacs is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2, or (at your option)
+## any later version.
+
+## GNU Emacs is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+
+## You should have received a copy of the GNU General Public License
+## along with GNU Emacs; see the file COPYING.  If not, write to the
+## Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+## Boston, MA 02110-1301, USA.
+
+### Commentary:
+
+## This defines a bash command named `edit' which contacts/resumes an
+## existing emacs or starts a new one if none exists.
+
+## One way or another, any arguments are passed to emacs to specify files
+## (provided you have loaded `resume.el').
+
+## This function assumes the emacs program is named `emacs' and is somewhere
+## in your load path.  If either of these is not true, the most portable
+## (and convenient) thing to do is to make an alias called emacs which
+## refers to the real program, e.g.
+##
+##        alias emacs=/usr/local/bin/gemacs
 
 function edit ()
 {
@@ -44,3 +68,4 @@ function edit ()
 
 
 # arch-tag: 1e1b74b9-bf2c-4b23-870f-9eebff7515cb
+### emacs.bash ends here
diff --git a/etc/emacs.csh b/etc/emacs.csh
index 3de336b8075..393b4793bf7 100644
--- a/etc/emacs.csh
+++ b/etc/emacs.csh
@@ -1,5 +1,5 @@
-# Copyright (c) 1999, 2003, 2006
-# Free software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+# Free Software Foundation, Inc.
 #
 # This defines a csh command named `edit' which resumes an
 # existing Emacs or starts a new one if none exists.
diff --git a/etc/emacs.py b/etc/emacs.py
index cc72233602f..e38ee70fab5 100644
--- a/etc/emacs.py
+++ b/etc/emacs.py
@@ -1,6 +1,6 @@
 """Definitions used by commands sent to inferior Python in python.el."""
 
-# Copyright (C) 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # Author: Dave Love <fx@gnu.org>
 
 # This file is part of GNU Emacs.
diff --git a/etc/emacstool.1 b/etc/emacstool.1
index 22eb311789a..ef1941111fd 100644
--- a/etc/emacstool.1
+++ b/etc/emacstool.1
@@ -136,7 +136,7 @@ emacs(1)
 Copyright 
 .if t \(co
 .if n (c)
-2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/enriched.doc b/etc/enriched.doc
index 0b83bbcabfe..25b034434ad 100644
--- a/etc/enriched.doc
+++ b/etc/enriched.doc
@@ -256,8 +256,8 @@ bug reports are welcome.</indent>
 
 
 
-Copyright (c) 1995, 1997, 2006
-Free software Foundation, Inc.
+Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/etags.1 b/etc/etags.1
index c6bdc7e8ffd..aae98875b68 100644
--- a/etc/etags.1
+++ b/etc/etags.1
@@ -1,5 +1,5 @@
 .\" Copyright (C) 1992, 2001, 2002, 2003, 2004,
-.\"   2005, 2006 Free Software Foundation, Inc.
+.\"   2005, 2006, 2007  Free Software Foundation, Inc.
 .\" See section COPYING for conditions for redistribution
 .TH etags 1 "23nov2001" "GNU Tools" "GNU Tools"
 .de BP
@@ -287,7 +287,7 @@ Stallman.
 Copyright
 .if t \(co
 .if n (c)
-1999, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 .PP
 Permission is granted to make and distribute verbatim copies of this
 document provided the copyright notice and this permission notice are
diff --git a/etc/fr-drdref.tex b/etc/fr-drdref.tex
index 40a238d529f..5920befb504 100644
--- a/etc/fr-drdref.tex
+++ b/etc/fr-drdref.tex
@@ -1,7 +1,7 @@
 
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -42,8 +42,8 @@
 
 
 \def\versionnumber{0.1}
-\def\year{2006}
-\def\version{Mai \year\ v\versionnumber}
+\def\year{2007}                 % latest copyright year
+\def\version{Mai 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -54,7 +54,7 @@
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{conception de Stephen Gildea, \version}
 \centerline{pour GNU Emacs version 19 sur syst\`emes Unix}
-\centerline{Mis \`a jour pour Dired en Mai 200 par Evgeny Roubinchtein}
+\centerline{Mis \`a jour pour Dired en Mai 2000 par Evgeny Roubinchtein}
 \centerline{Traduction fran\c{c}aise d'\'Eric Jacoboni}
 
 Vous pouvez faire et distribuer des copies de cette carte, pourvu que
diff --git a/etc/fr-refcard.ps b/etc/fr-refcard.ps
index 514af69d029..7d82fe625d2 100644
--- a/etc/fr-refcard.ps
+++ b/etc/fr-refcard.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: fr-refcard.dvi
 %%Pages: 3
 %%PageOrder: Ascend
@@ -11,7 +11,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t landscape fr-refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2006.06.28:1523
+%DVIPSSource:  TeX output 2007.01.20:1524
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -414,6 +414,7 @@ dup 50 /two put
 dup 51 /three put
 dup 53 /five put
 dup 54 /six put
+dup 55 /seven put
 dup 65 /A put
 dup 66 /B put
 dup 67 /C put
@@ -480,249 +481,253 @@ B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E10A31C7011C0FFA
 99B797CE549B5C45238DD0FADD6B99D233AC69282DF0D91EA2DBD08CE0083904
 A6D968D5AE3BD159D01BDFF42D16111BC0A517C66B43972080D9DD4F3B9AE7FB
 11B035CE715C1218B2D779761D8D7E9DEBE277531BD58F313EBD27E33BEF9DC5
-50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB613F796B02
-D8ED841A432799EEC4E016FFBC62E0C87CC6A3C436F4DC35BBAF41697B2485A4
-B5D034E57D84406BF8B34CE1C3ADEC7E50B978AACBB09EFB77BDAEBE8CF31673
-152815BCF0D9DD5C8A44982B8E6A239D980C36DA336DF19605AB930D9A64E842
-5AEC9B53BCC2E72B19FACDC6462071B1F56719A0D37262C2CBEA20D3BD7BDE38
-35F7CE2841CF6D54C7D37EE6E0012C01ED30D95D876FF2BDDCAD20B8C39113F5
-52070A1747D673FEDDC273C262CEDC0CFAA77DAC397C05AAF52FB9980BF78ED9
-556A3C57322E09F7AAC06E21686B2DC7413649530CCCD8CDEFAF386503744636
-4A0A0DBD44F367F2AF0F7623763F7A75C5C4C081B5A736DAF8B0162F52B9F8E1
-EE9DC43F6D861CF065131D2B7C7678988211C305EC49BB1DC0CBA869DB0A5BA6
-89D935873AEA2430EDF6D5256656FA4F3BC36FD8B161BBEAB7C4906142B4120C
-3524C478D749ABFFDAAF1A763FDCB9ABF26E341D703042DE79802A70CA380712
-38D5CE4E945679CBFA42B817ABF30AF6DB144BB16261DFDFA2847D45D582B9C4
-AD4DE1A89467447FACBAEE239144EEE27B2014431639C72AA02FB2980E496E49
-8271F97E6B3B98D3BD65CE6C0063E3B7091BAD2B39AA8EB4E965681F6FD5E324
-B1855D36F77C6F82D85026103E12464BA2D6A2DE9E9D23FF953BBA129F01DED3
-0C4A6FACA1D48F3B048DBC319A0659AB406C1279E9C9D2C7FC29CFBF4DB23007
-CC911D98CC96CF93CC93AD4C91B620F3F4231E36FC04BBFF79E7791ED29A18D7
-E64B3D50D9382E014A3FFD97A5DE97AD8BC569E2C4D5B5109AA59C2715563BB7
-7E6F3FB23C789A1B31DEACEE75DAC5A3B59DED1CDE8E791938499725B234A99A
-5632EE487E36B0DA679BC2BC5061E4F8F98FAA8E15A5FA323A75A3D60597F333
-F67291F7A4ED9558FF66F3AF79093D38D9828CE65C258917AAEE8518A975C853
-DB8019A4802655A246E0B37DC46E59D8842679D5352AC38960695B5DC11DF1C6
-8474CFA43B59644C2F9D3FD931A843495281F3D4039E2043FAB22AC5484F567E
-AC040E9ADE98B4496AD42667988E2C901562A67686164A75BFAFDAD461AAA165
-43B4DCF3BB0EF56969598FECA4AA7A4F470E3812F4E950487F09F251A2649FA9
-5DE2F1049F15B09680693CE688F7385FE7E122DFCABA21A386136E41BC1CE6CA
-CCAEDBD39B31F776449454B28D21B8BA2B96A6D3C0894980542D60F932A796E9
-84B98F88DF6B4921E24317D1BB718204027CB407116D5DE1B1832E48DA134F6A
-79DAFC1B33F4382C576895A4869917A1ED5F3BC1292CDC4138AE1C1AFA0E177B
-1A410AC33A07F6E7FAF087D0755DC17CAC6B0E58EFBC9C8DC46D2F8AF1302329
-05F52FF71FAD40C4EA0CBC9BBE2EFAC772D4525D58721549FCCC972A3C6A90D7
-52FEBA3F61D901F3D271C528732D8AF9C271610959207CD5EEC3840FDC4F3F71
-205613FC78FF243635D03DCDCA51A3121FD153611132CEF4328B687126947E4F
-0C3489FC2DD8B3E145255A93C7920D06510487D13C46BD44B80CFD128E00963D
-7D165A1186DDF35486F1A88BF171805035BBD959E383D03FBBE31B7FE9933C48
-836E487A58B06DA3E20A5247CBD5D42620634F62CA89D56AE99C6F3DA3B2802D
-346774B330180BE19FD5237955E3707FA4D1E570984A539E7168D9962F8AB00A
-B759B8554EACCE76EF763E3CCB4CB7D65D4CACFC152D9AC6A638BA84616F71D0
-CF871B6C35D619385A3920BBFB30604E08D147542C127E673060AC1D0DC5CFB5
-F1DC09EEAB891F4D2BBFC321EBC13B9D466AB5BF1AED67258E77118CC684BCB5
-4F0F8011DD11228C089D7A5077D21BB320894D722707BD2083A8F82DE57B638A
-C0ECE121E64EC734E2ACE4C6F38DCA336CCA74A58964E8A2B4978A8374B3EB1A
-592060E2C00643C292430FF1F1274D32FA6787EAEFFA2FF701A0F2CE7741A350
-70DBAEF11490D1EA4DA082705DDDA2679F1BE298665D4E9C2F9F96D43E1F7CAE
-BD4158D287773E8A8399FE8F3B4C2FE39FA8E702A07335CEAA3866B773DE3E21
-5CA4B59B80DA35B09720FEB8F72AAEE2ACAF5AA8162E9F771E1679E4F2B28FC6
-8C8AAA275EF6CAE77E3C549F774BD0174234DC10D81FA5BECCB75C1C7DC5F7F3
-4FD574FAB98C8BB200FD5B994A25C69EC137BA906D4050E4498CD13E830324D8
-772AF6E0C27585B401796D13BAF5A3C04935F02EE0C6E7730C0934C94177F549
-0C3AE18281A27AC7A6521988FB939E3C470494F91EDF2DB88EAC42B63F4BC811
-14555D271E1A9CCA082A5EF33C47335CD456315090563B60AFCDFF95F0D0D25B
-39F7E49EB1E514A8DB2746A839DCDDA382F5AE3EFFAE2003149709A79D0335C6
-BF1838D79A91A3CA6EC12384EB88110E7F4E496C9FA75A5D8AD19CD0F7C67F4B
-6150DE3A6DFACE4D2FC6A7AEB82225E180FD7938A29B145E9889B5F009277051
-F5E55C496E377E375CF7A0D6445E4568026838BAE977A3847E7EFEE3031487F5
-271C91371852BD93A44D34A66002B9FE2119B0B923C174A4D779694C8C81B3D1
-8CA2957553E004D6FE1EEB861DD453BF858037FAA2A4B1D91E681F830B1DAFC8
-61765A67156DE12FC5C503FA2AD01CEBC2578DEA2DED3AC21D87EECCC7F27B7A
-F2A9730D3F6E733151AE879AEF55F66E46BC798C305DEA9583F1F918657F541A
-B4D9D4A6580DFD5890C16179EDF8D19CB48853B48D350556E46CB04AE78C5A8A
-13B762F759BB33321D4129925D5928DE8280C33EC0F3117E85B10F5DD811511D
-7ADA7A3516FC30779F41BC8E367B38E093F5EB4223CD74FD1A4995E335347838
-5A501EB813CD6382D516247883CD11BF79F33EB6DF3052B6268100A6F54669FA
-0FFAE918AEB737B616C0009974E3A3C2F3DEA40ADE7181FB85D81658CE42B131
-FF6740B71D7E05BBDA66ECFBEE3116FAEF0F9EFF9E4AF29A06B41BB5B84857FB
-BBA1E8673FFD28B224F731952D011FD7E12D2B0FCAF003D148F8E2C606DA0A4C
-DA57F335FD56B245AB9CB4A8D8782378201FA12B8A5FBD4996D024FC6EC50A7D
-225CE5ADF8B4A1DE9E4579BF790F4CFE0BBFC0F4058FF908C952984C28B8A6C7
-5890C0DB5CA9295AADA82FDBEA85DCC30138EE5931C34601D8A55230183767EA
-040833B9A7A0DDE511851A7DAB3C245154BCB91565220A5CE240D345A163A452
-E45EE977AE9AE517D8E954349C9F1B8FFF99E6229F90A7AC9BF030BF0BDE7392
-C4B3EFAEBE10B03A39E4A45711BE94F5B2F00928D3DDE5A0EF834D93FDABB670
-6493F8F725F428F4D00687E82AB994599B82342B92C4510FC73F7F81E06FC2E1
-195D2103A45865FD65B94A91FAB9558EA75231AEAFC8B2DED6320D9F9D272F7B
-221557338D6F924452953E50F9240D9E841304E99B15A780DE9D643B21FB5C54
-4F568CD0F26285E5E58567BED2FA1234F90A4847EA0FDEA28118508F1849DABD
-FA3033F7D43DE282C78B563C0D8D889DD6974EE1807A7977E6811412C94E1708
-90FA8B8C616FE747215BF17C3CA67B32910CEBC9D2E8572EF3961F4013650ADB
-B92531AC7133365D3C58CFE1BB60F65CB0B1BE32F8298001407D78675875A5E2
-76FB414201345276A010B69F98C66EAC380641B65E13A0CABCC9BAC1D737E6A4
-B7DDCA8DA016D7347493E661556F7D59A5D0A076AA479AEEF2FEC17235EF37F5
-2C399FA96EF1DECA207FD483B8B233271C3C237415DD1CE39D4DB8D85EC9F785
-D7E75046156C70877F0F4E19739D97AEA30E9FACC340228DB6EB941FA1FD37F0
-B5F48CAFF00430EADB51718C1E89FD4CFB40C9C598E9F87443E7C61B4898E4EB
-8C91D1DED94FF32CC5CE4D07A21E162E245B317546E4C329B5CD39966A018EE3
-5ECD6F30CA302A3457B5F3695B22D2989FDDB46024462513D35C60A34AFAECE4
-B2373C81E30AE5317C3EFEF89BC676D2B076A419F0F3D0FD0598D44F7A9735A6
-15D12279A675083147F409897CF9561AAEF91CCACD5D7E8241877B469902026C
-E8DD1C4F7E51D9018A561A13FBCC50C0C31DE97C873A92E1B0ECE0EDB53D727E
-D6B7373E963E5AEAF53ACA0011FA80D1B743CB801F0C059206FC61BFA4B63AA8
-6FCB243A10707C5A0486048C91F44993BD58A90CB1E496DF207F19127DB071FC
-AE6CC3CC1040408B3277A7AC3E0297BABB025F7689CA71BE3E3692EAD1D3248E
-7399C02606A5A11A9C0CAFA0C6BB44E5626335258E29558237E0D711D5959E26
-A637D3CD824615121D98D7D16EDB096E4936EE2EE3DDAF79FDF0648C12BEBC19
-C1A5182EB1E178D1031AC6D84145BD8937C83FC21E680F77D2A343E35668DF72
-18F7127799B4B442AC3C828DF9B470C52493C6E2EA808A6C5C7883481D2B6CD4
-2806B517EFFFC9DC9E719BCEEAAE2E0C02E6C844ACD8EF77D9DC8074D212E57C
-28C01A5C6FB91C6A96FD759B0A5A588AF6561A3737D29CE68B22EC1946122195
-8DD910F834633370468724B4BCBA6D65B9835E95C90D8881A67D8E27B5F11CF1
-C1119C13B56B7AA32EC4B8298621372DB5C0FC4C940FBAF4E9700A2D1FA77902
-7327FA103E2D8BC38E17050E07B07AEF3166E4688DA53D75EC70F22C2038F2C4
-DA06D7A9F3533D351566F2B5C58494FC1E2E42E02CB82EC0FA70265771A1C2E5
-D9832A81AB552B9511BA1F403956984BA49E51DFBE80D3FAFFED04D89DC36821
-28D5D63B3E3B05E2A303ED4723BC9DAF651FC1DBCCD6D3284F5DF0298C5FBB21
-AFA6ACBA3555C30D497376AF2E1920C3D52F70C46ABE83F93113682047A1D9BF
-017CCCB8C90D7192FFBD1930845E5CC2573FB32BFD68535718BBB3BA72F99664
-2DFE10347D083E1EE9958E99A6E108B9AC297735FF926221BC9E57A3008F97C5
-DCF204FB6CDD56229E0F9A7C01DBF06C45758BE21EDC04479C4AFCF47FEF4E81
-292CDF8F4A2A37E8CD5C77428539C89368E419E3E4388BF087E353CB9832B230
-F469F4E834E52D97B7DC21315B58F64EB959F72199CCB18157CED302AFCDF898
-0912B02169AEB2838E6E0965949C7D6D2ED20E408C4B673B8B97ED836540B9FD
-8DB84B40687EC082E229EB42D3AD6D3180AE7D4805B5E37DE59223A8761A2C16
-38FEBAA9DF5555B6BA5D3598B9DAFD976F7958B4EDFB8B216A28E29CFAFE2BDC
-B29789B5C664F0E83E7ABBE68FD53EA9973644CEC5902A7F034429D3D3F95622
-688AA70D0FB77BD03E70497F067170A7F0366163AFD08F1B295BDD064C516034
-E0DFE4A471C58B34771E7931FB49718B21E06B9AF57EA2E4654CC1E34ADDEAEC
-5D525C113DD5ED59E35C58283BB31C89C162384E94451E5AF534B7BAD65BF94D
-EA8A3124BF911684C18C922E13B9EC18BA47EC24CDFF1E5701178A7D24C35DBA
-147788B9B302A5BCF088A39E7A5281884DD4F77888423E45642881451CF65DAA
-8ACE902BBFB66B29E3AB1760CF5D0551FEDEE7724C81A74490ABA0B350467153
-3377336B38CF72F75A1B170C1C65530C2A623A3DA36541DDC9F7C47275B38D0A
-BC5CAFFA9BC93DA91922E5F83D32B0F37CAFECEC8849BB7B32182C81FC07FBBE
-4415023F4C61DE7321B1FC21083C1EA8CCEE53BA74797B0DE1CE70C94B72EC20
-DC9CD32253A06C6BEDD7B790549FDB380D855D51A9ECF8D54C2C76A9BC25C245
-64E618B54E8960A9A53737D1BB52F9620CCE4F4FFC48E7BD9D98FD7BA6AD5A97
-EB88D68520D5961DF8B7706112C8485426397ECC9CDC716603D8FE3B4B505406
-FC04A0D560A308E9C08DDE412D9DEF5FD4E3F4B94DB2CBBDAC758EBC6DA0CCE4
-2A7E1B97271D6E1F6523C69E30465EF9038ABA4AEB9572B4FE080401E66623C2
-14334C66BBA2A1B6146A768F12DA3F1556E23DCA24D5EEF35096ABA3C2637EB1
-59A97E94ECAA409E6E0AB6D240213BDF38F85F47F2BD26D30B80132A64746BD5
-0897BA31B6C633E5EF1E09F1EB0C08B8D586376CF96D0B33CF31D180996E397D
-C787C415E8D38F17C9C82F0009720E0C0E7FCE0355736B532364E86C7B9B45E6
-A19FDBFC7E64712D78CB0E6938C4E6A76AFB86186F19ED172E375B1734E1EA8E
-77C40EDC1A4CDD45DFD29FEDD5DAE61E9100C56BCF45A6C1F04C72B99EA4C91D
-7167003F996F145230BDF837E9FD552F14C670F03F81711FA6B018034C46BD47
-E67A18339101DF12F7202A183C1E012DCAB50E68E50D79552A966BA93FCF4E8D
-7AC55B4260E72B67CECE0E2F5E4CC93992F0BDC84CCFF11083D73E367CA503AC
-7C9EBFDE03F378323E9868365106BE44BA8E1AACC840EBA3D7C48808ADC6AE56
-296B77FDE187DA960463A7FE637F073AAE25E9E9A8D55D49A527EF7229311969
-2100A084FCE5017D82366869E7B71918B9AD1FA5F56ED11391F57C0526B5F0F8
-6626AFEF27878C3B257E84085F74C2FD10A9170BED299CDA613FED0E341D9F92
-89EA9EB251C073748441D0B5BB6AF019DE31920B3A99378F4B165B4C66DD2D74
-B84F7C140EAA47DA8C85DB135EEB60BA7CF64F2FA2BFC25A6D70547EEFBA720E
-C5E90BD653EED37288E3177D6373C7B8DB623EB7A17FDF2C4B78AC50B074B6F5
-644E0199ED31B034E4A4B74482FC317F6EE2FCA7A26C8DD509D0A08A68BE914D
-6A075E31A52CD42DE06F91C7574E0939405FDE18C6B6C01AD4BAAB1622177A98
-F6FB4F1DE83319A1EBFEF8B2A686324042F000BD43C03A9713441DAF9CF373B2
-687A44661E9443BE5A657FDBF0EF24C0DEE8722447CC24899E28CB576B6A5A23
-F752B66726229CDF3AB707DFE98EAB9A1816D867638C0D7B38D3A0009C211FE2
-D47A442524981445312BAEB65201102E831BF354FB3EC91609447E2C5C65D42D
-DDC2F5C6270A3755F959070833464A39B78EC3C9247D6F90C7B5111549A737D4
-5082F9B1323A1299DE43F8F4A74FCADD9EACA4D75BD2429087A6B5B1C3818248
-37B4BADB7B7000989C8FFBC313AE781375A9258FDCE23741338F483B8B624161
-6123DF951598A396FD50F8A70815A1708E23ADEDD158FBFFDA2780E06DAEA1D2
-91B30B6A0252E15CE9CB64E9013A450A9F87AA7E3B2A4FD12B290840F91B9182
-DBED9B4165B627B367439734AFF537CF9B17167461DC8F18E69C3C7DCC09AF1C
-D45A15990FC78BB75A1131202FDB002460927E49C37A2239E722CC24B989B598
-9C3E8CE0EE4BD5D79C905CDF068D98A375AF097B680BDAB5467E0C076404FB0A
-9C318E1E99F9525DEC6766DF4C2D167669C3B87A3EE6B387A9DA61E6BF6CE5AD
-5969DFC83D38231E249D22B9D74055DD1A8ABDCC0550A775C21B12EC2C40033F
-6F6D928EA3435FDA271CA581AB289BE58CBA667DAF7534068C560A25CE0D28A2
-00205B5F8245167D478F575CED77B733D47027E733E6BBE122431192BA0E94C2
-A10C3176F235FD1A74EFF018A173670A50C76E50070DA0B93BE24C9843B403F7
-52C45AAA6639B801DAD4DB336DF1B25BF61AB4C8CC4E6AF840823C99A87E7DA3
-2F871FC117C61CAADB558D6DB1B69BA429599F1E9D51BC05A0BC4E050576F6A5
-3BFBED5ABAD746475A5B9ABE43E8592D81F3C600FC456F77842B37E4627007C7
-66205701A812A063C2A11FA6A9093CC715C1C149AB9F50E0E704509FFF2B77A2
-7F2ECA1C23F38E1FBF72C8A6BFE1BFC636415305DA2A3D0042206343D654604E
-AF935D743DFE0CA0D36603187F5E92AAA82DFD2B2760A3968A5EA9D3B32425D7
-A532D38B726F5E8832D349829EA18071B0AB864B2058A56270FC8FF1B6DEB6BB
-2AC20EE74A55836D6BE95953D785FC40D314DAB4D16394DE2516D2DFDE52D512
-330DC6DF0D7C60E713723030458FFD755A79BD259F12620DCA6A5708BE667BC5
-78415BFEF5D50719BE61EB7B4E976E3AFF5354023B3E273A6292852520E78E70
-F62144237773957CD6D3D78FDDA5D1E16738C74CE0B1ED2C3BAC72B963B055B7
-BDF753486977AB9C14A352E6040D50EC9E58E7566DE53C1E135987C89D3BC638
-1CED6BF855080705F43F5B88FE24BA527107F8F718375CBB2A88A2E0888F0D37
-036C9A2EA841B496296F42971D132D76E344A9BA2F299EA66CC92E0A67E6B988
-3E230895DA5942818B8ABB74DD67CECECD46F885E85DD16697344B2D98E5D46A
-D7611EA65D137CCABDA774B54F79AC7829E44C9F6A70BFD7A5C96CAAA568E7D3
-DE8596A1BA3DA243DAF41400FB66520566ED36AB34F850B56D4F5D11B72FAC08
-20F85531A594D6C4CC7B808CDA4632CC4CD0A6DF89D101ACC3F55439C01DCA22
-6479FECFEC3B3E0A88D5688F12BEF714ECB9D81FBE2E581C10E49665082F0370
-6F9B8B95493FA23602C6FF8B1BB06B76E92F0DF4089EB10541A4180F5ED3E57D
-7EC54B11274C5FC77D4DB60044CA5045461DC02BBF01243DABA59CD2FF3F08BB
-9C39F1126AFE182BDC0446F7F73CDA484587563FF67968823BEE12EED943585A
-7655F4D237A493E923E87E3E4263AFD7166615BD6E19ED2A4F5577DB89F2FA3C
-DC1654AA42C1E6B15E3C230ACE51779B8D234FEF96DFB59D24DEA63D6D438123
-BD5B7CB3B914C35B33EB98675BBFDD3BD1B9A76588B5318899677F58BC4A012B
-30BFD08DAE07DDDFD64ABD5D008326D9FB5F104195AFC6007897BF0036BE2362
-42BFC0C88D5BC939AC6AD5CB7208A309EF0332349FC4827064DEAE07642E4484
-BE4F46C26091E37C0FE6AD3C6E920132144ECD331A016C84922523580C925354
-FFC830CBEF47A72AE4C8A179080B9C7B72AE9B041B36CFC908B5C6681373515F
-7BEAED33648016A3ECAF1BA52DBE655EE67455BF347101E08E5B9931A49167E2
-73436DC3B164FE9010EDCBACF3EC3A66205CF2E122618DCC8A397D5375B01061
-B0351796E04040D18815FF0FCF6EC92FA944541E158A2581B0B6281857D22370
-533163A3C15397AA0C33FA41F47A5378703B5BFD48C194AF548F8FD18FC18F42
-33E57D0A1BBF18B2918AB6F566D13561E6083603C3B03072276F7BB597B54A86
-DE1A64C238D29756233CFA8CA898643E48018CD6164DA70B4444EF5FBA772EA7
-6E6B6FB3A9E6A9540D48108D40259755534299E8CEE9DF0273880A91C8C39859
-3AA6AAE789E4342188F9BBF636CD42E9C6CE31CB93D3BB0066CDE0A4BE0FB380
-3F7A1D170306099A0DD6DF58EA4B8F8F7BF3116E15F57D703EC3513790E10201
-E927D0BD73325EF073E04EF0E6F8C9D9A56E4EBD38F22E1714FC641AF2510A88
-EEB6FD4B320224FF8E7822387FCC3236397E3E3CD90607812A3A778255AF3D98
-E174F9DB13B60C08D35FD05FCF048E716C5C44EBCA39867CC594265EF185ECD5
-D44D6183DB6A6EDE55E2E035612A6474E6686E5664C0B4F34126B67E0EE46C5B
-C92AEDFECC3085804DF2AD084C79F94F8F7E96837845568A0291CA2AE4011551
-6D00C8A0FCE7D2A77F986736C6E5733D7C23AF6E5D70EA56252712578C39BE8C
-E50750CEF3E1CACB4995460ED9C71356EAB67B3DE4489AA7981C4EF0F36CD719
-4E8494F9626E52E8F9BBB438CB901434CEA0851C5CA953A401824A13C14D4BFD
-4A8DC4CE54451969605901CD379DB08DE928153EA8668D9EE6271805EC0DCBA2
-AA8D0AA171A5A4503C3DA9C202F2BE107C4501F5BCB945BF2AFA67205F1BCCF3
-58607115CC0727A702859368493595ADC8B3311654354709D5A260F94C906660
-1C6F8BA920958C7915785490B38CD76EACD61ECE87D792AF83A387BC05739A64
-65BEEAEB67111265F98AEE8AED6D933CED6ED3FDAB1E3D8C0DD5F21F4892EE98
-20A968F35DD929BC69C0A2360C5F3B851DC301180F88C9E43F89C997EAE839A2
-881F0C141ED16BC9BF49B1C3A86F68616ABE00E5AA4B2F878E63BF770EB8EA56
-B16D4E35311FDA261F0787B1AF330AD4BD5B8622BBE088A6E6F06437E98365CC
-EB485DBF2631D3CE2BA023196355E6A7E47092DF1F1E42B8E59B8BFE743F6E30
-C43641FFCE1F4991942BCA145D9F85DA72C046B14BE6CF9FCCE4EBB73199B21E
-0E0FAD79AAD53DA6C541BC7565ADE0E7D4BC2A58FE7D10095384C986FEC1D899
-3332EB6DFBDFEC3C323F5CFAA0235364D1823E72074EC953BB12821E45BC2655
-FB6AC4E21F2BC4EDE2D69693EA58E914550E1DB06DFD858E0183554C21339D8D
-3BB3C8D4CF49208C5B38A0E3DDAAF890A8D966AFACC90F8B69FFA0CC2CFA5A42
-317F1BB8D5AF61AC2680EACB5DD690D0FBEE5733C2621CB2C94ED599FE36D41A
-645CC6FA9121C222D674CE059D1BC262A1352E31172E113018FBFE3658F9CB5E
-A47C5D1ED6CF3E60F2118EB2F515DBA5452B34C4BC98ED21AE6D4BDFCB0D0BB6
-8343E4C60178487ADC6FAF8C5DCD375CE4A120C9690D68E0318481AB43A027A4
-D9867467B9D7CE828DAD3C89A912C5E4DD07171EB643BAB870BAE15D97DEC31B
-9C3142A442C420D2458D73F09CCA91B0D4CAE9405DA3B8561EAC51F905A592A1
-D266A020B70604D87BE6FCD0A5232DA2DF82E106C93A3261E2D69831CA886B76
-2CE8F0DC4E57DA18DD4688A44E53DBDDD8FDC0F9CC8BE203376E14760A60927B
-51593B81B6C9F6D38A6510926BE47AEC5399761D9051DA3FFC79B22EEB72B7D7
-947782D8E129ADC31750AF12C5D91E01BC2D5287B5759398C8CF5AD2ECE6050F
-3E078DC39C090C1D5D29CB4181931A1E524BEB8AC1EB5461AA42FD34232E3FB3
-D822D451B1237D6EF150E74328718BA4206FDB842B48C891029AA822250243B6
-4BD79F1BAAA88B7A4D5E10A01D5F3891CA36C4407FAC504A6ECF18EB76410967
-BD8F0A6F78E7174B4A07E10F4D458399F2A4267F9887EE7A93949E6926118D5A
-E72FEFA96D06A0891731363F7A22C8D6110A08312BC54F46DB7E83D8FCDC6113
-0A7EF4719AF48A49A47922D941C36D72AEDC9CEA7302972A664DCF9234EDF9EE
-EEE565476A9B94DB3DFFEE9F2D28E4D9E90F74D46FA81247C52DA77822C5E6B2
-60F7AEB3E3A7EA93C3AF037292BBE323185B966BFD7763810C1E250D0316BFB3
-D7ECA35B267F11
+50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB613EAA9394
+D530C44C3FE66EA8FFB60C9AB182FD0F3F939F2633EE5CC31283CF157B4B8D4D
+F4885866C66360340649649BAA36FFEF7EF359D2E3276F855D5F47A63BA8EBE2
+DFC83528B60BE793381B89398CC5F00F8A63BA929BE36FA5327BDBE8B68119F5
+219D0925E7706B4E90BA28D2F6630A56FB0C73B717A4175EE4484E030A0B56B9
+D0A6E4244E9C27EA03F3F041F5F6138FE0A10CE95492F8505D02C395B5466BB9
+71F42E9AA34E61896DE1837B6647BD578A66320A79C6CFC75CF4234AC6745610
+E8EA4A80A08C87FF834A997C73AED3711458D395DC0509FC4A0AD8C02BAD0A82
+1C4CBA3AAF2CA5FCFC79CC0B2755CB1BD58F3DAE3B802A3ACA5E3E04E5B6C577
+C7CE3C88844C19114758B2E07CC5A3AA2932221EA2794E875E7CAEF35828B992
+66C970DD5FB13C21C787452BA5B3421C9BA6FE12900ACDE16088734FD017F221
+0D4748A96970790A94DB9EECFFF0940746ECC399A614C8B91FD2A46BFE7FC0B4
+FC3716DEB3C23475D8051C37033A8F4AA09F24190BFF65C44767929374C30691
+CC99832736045D3FDC8D62875BFC0371FF64613AE62E07F6CCB07990D44CF2FC
+15584D20F6FD2FFD9390E7C4E04DE67093A7FB7ED9DF317FCEB909B9E3910CBC
+34F3C7870FC8200DCB0EF4F0BCB8BB88DAF95FC2C5BD4ECAB0AB0DD5AFE65881
+8EA6E45ED985DB9EC02ED4873C8A61A6ECAC723835822AC111821826F894EB97
+B24CC14F23899C6308B46D439228ADEE575D8573B75262FD39778711F255514E
+B0089950B2D5E4511A505BE441AA0B6343986C5D47893B9F2EA8E2B0985F25BB
+F101BD6DF9A1C8F911AEB5C80476F116888D759C7F69C2CD17A6B6E13E2047A4
+97D50D6C7F064682B6062F51CCAF91AEB28C3D1A27D00F1506A5C5E424B7F9B9
+F61C5490109EF8A1024272CE56DD5D628366E66338F9F41C1F7374F3C45D1702
+C4B76468B7343E2A999C0C3D8E7C98F7EB90C9496DC1D929CBE7FB546E9E4BE6
+2EC6F77921A2359C9E61F3CE84BBD3B17B223FC3A0CA8DD41536CA5BAD70823C
+C215305F6E9500FC9650C26BB876966288E3BFC6BE74A284D71D7E573FEB891B
+932E310DF30B91BB20473670AE22D21BC21DDB40AA887112D92B04160329B176
+A5948E6B84594FDE8242BE92EE065CC3DDBB00A58009C649B5BAEEE130BCDD1D
+B9410289F7E4B477F52CE4E97C552F9A8DB5D573FC8AA35EBC7FA4A3EED00540
+F81650DE47117E01F41B7DFBE4945ADED1AD195D4E39F91D63E824100428CB42
+C7A4919B154D1EB79274C476D89553434CC1236E64D2070D24432B4AE25F346A
+C36BA7FD43EB7D4C826C4DC20C384BD67829CBD4696DD17040AC41F8E941DB0A
+95F10349E343067E14F3CAD6C2602D3761D445F6FC94BC2725C8183A7B9B63E3
+44ACFC71131CBB44D872AA9DD609402A03394F9164044005575EB84CFE261812
+70467860A055806E848E01E0245E35EFE12505F425055C32790D2CF475613683
+8B22770A58F3CC356ED3367990FAB109806A5F37A4706DF098EE353F1A626074
+84295A5E4D070E690891DD216B55702FC9A222B5C6000648DE1FD15CD00F50F4
+EB0F28CE7E4DF26A9F5AEA01CDEBFEEB7EAC3BE1A8D2DD9CDBC9216D9CF56C48
+634858C1013AE01F60A19D3CF9D33F02515E1B1A0AE0CE5F49EA2355783E4A03
+3C84920E68355C206FCAB59A91B45DFD25A3D965D2853230579E16526715588C
+1007CD787D72F52C3683DFC7D755AA5820947DCE4D401302DDE4CC46767992D4
+27C9F753D3AA4E52A7DDA0928F2C5A805DDD8D0A8C14254836EE24909DBFDAE8
+20DCADC2931C7AAA089697F00A3F25413FB841AF905C8FF3116BAD21913E3EB2
+9CF58D0FC5AFFE0F08BCF2FDD13684310B586532BA479346607D025C7AC53721
+48751595A910CF11AF8AFACB10D7EF7B8A3B80E4A1782108BB24E1279022F59F
+24828A6B5EE73140A9D1A74AD774C3F4C181179A012B726A922E5D54AB79D5C5
+958344AA47437635790F7B2CB59B9191BFE0F6FBAB28CB78F506DA2A1D601F44
+98BEE1179546E2FD11591B5D50C0B1101AD8B33D4E54AF2C15DBB0570B88AF7E
+43944C5D8D05D817B18E6F41C7E900B56A9CD196D5AFA1D715CEB73C07DF6EC3
+3BF7C9411140B544A6866AE691F55E94A72E4FFD922A2E08FD4C183A5693C355
+AA485656735C842D353687887D59EE375080A61954F5388D52739A3248543220
+1555FCE8956CEACDE634684FC3292089B1008290797B6DCF9F8C7B89E22430C1
+F2C6DA1BF663C05B3BD7DDD2DFF7B6092E377517890C24F08507C9EF29B11F39
+C9A989EE270AAC39C4C12B1F8F749D6C67EF7A0E39EF5D7ABD889F4579CD6DF6
+6EEFB8C099A9087B79A66C3F27C01A12B6692AF19029C257B4C5788BAD3901DC
+58BE54AF112DF564E16E05E3E1A5ADAFC713DEFC4DFCA8203866D95B7A3A7CA5
+0D094D713759132E3069907BCDCC1E411F7C5566D25789F8ED8858FE86705556
+9DC7AD84C8A5F71C7BA386E8E3159927E70616ECE077D72DA51082B08BD36FC2
+25E0678828BAEA91D699871778D34AE22BF05F59FD8A7B7B00D2984AFA884DE2
+EC201E75E02425AE70B432BC1A13A611675A858EFF58E3E10BC679A9AF72912F
+7A3368F44BABC0FC75D32F52E10DE61446C058C83499133AE468281F5609B217
+8008A521909151B53A0802E8C0AC992C7C3BD31E86C9AA2368AEC7964AC23E27
+F5136D4EF3059E332D19121CC95B77E4A40235AB5C3753C4012D62CFCE894094
+EB5D7D7F576CC725A6474C96263384B9B33AEB121A9E40A76937DDE710DC0760
+414F2167C378C01B0124E9A907427EB4A13B8E41CF82BDF4B16E030598B06120
+8F8ED0DEE7E7541B0B5AF6FCE95C20FB7179EF0DA411401E4BBA678F132F60C4
+CCCD0CC45A6B3A3DBADA100D3D24ECB57E3209DFF35ABD022627249C2C9C3971
+86154EE0189583C45C14A3DC8DECDBE168FE2AB8DB78B0C7F5971D670A51B76F
+48B5418F89383F1E7CEF08BAA7DF462E573145E3CF27B28841304DD743C82AB7
+CF134DB64624B7638A86BC077AA3089500749720531713E97F69AE7C908E0387
+890C06F7F621CE571E4367C83EE44A1A7A306DF62B5B1F0F08D4F682507A339C
+C36B50F2A0C9AFC456A09AB0953A983827CC570C3FB08317859A9BBE8167F876
+A744DB4EBB7746FA16ECE4610055A35A08696A78B27B9198366FA2A6206332CE
+C0CAAFEE4614B533A9D3BEEC9B8F8C13B475657AEF597FCE507704675EA219DC
+B350AF6BA3666F18CAE2531D78786DDCF57A4F4F12D372C9506B8944DC003A45
+A1149BE50F318CFEB619CF277A387623DE238A4A856BC707D19599FFDD1DE0B1
+D5062FF6DC6C279E117DD53F8C642B7E0461D36403A86206442410EC08AC6BEB
+9EF318CFC9B16DC39BC254AB31C3D9516187AF81B5A2588A8362D982D50785DC
+BE4EE2CC4E331EEC9110FCE8D18D262AED1E603825B546027D8895A4184AB49B
+6A1471592A7D7982F88CB3729D88FE543A460B3D22A466CC890007379E4010C9
+9B44A45868C1515C3F83983B9EA396A0A3079DB7F3760F5FC65F20391BDCDD25
+6FCDD09C0201E57DDA12C152561D3B6D8D467A15B9B82D58554164E661591D7F
+604ABDF37F1860FC2E08521391DA3BB2CE14AC808E18C9679B6F71D2C39F9F61
+906FDE8114D1B7651743336ECE541C9D98E83BD48C9A42720625562E371D89E2
+ABF50E925BF879BC95D5831C5420B1732FC1329CA5508F7517D819510E7D75F7
+9ADFAEC110ADF216B532B7C2F3EEF1C79C664E3919B693A8B88B2C4079A3E222
+5A8AA36205B087734FFEAB10D1FBAFA1FB04CF10A269C36B114EE2325E173207
+103312B15D3FC60CF8B4D42F46FD36A4CDFBC6CEA9E1967C19060CE817338867
+C7C27BFF13901E44329B80EEE4524C4C306C7B8AC2E572C5002C2EC691CE79BF
+DCE16EBB1992B0AC8AF106000DE0657EF6833EC910AEA5C7E6A5961650420BDB
+407F15C8800EBD140C5A10A94E10926FCD387A35DF2640F8228164FEF3598989
+640DF5ABD9A6ABC6A502887CF943E7FF255B43C2E4B1528FE6D9A70B57BA1F8A
+FBB59E079991468A8DFEEC37A4E57B943696439307D026D7866EBF4720893FB3
+4077A9783B054DF4213189BD10FAF1A41203634D083D7B2C10880E6DBEA9F551
+00976D8A89A480B3B69C021AB12E357708162ED89FA44DC514FF9FDD08C783FD
+D2E2B302F26DABA2B9B0CA6CBEDE960AAB60482BD150A4A8C536F9A274F2F317
+288E371D40745D9B37E0BF1EFC4E4387A161032EFAA51AACB236CC0F72A15203
+5570ED165D3B5664BD7E22985F53A9120826F1B6B32AB78B4D58AAFD958B3C9B
+0CE52F477A86A6C1B342D1CC12CD6A8657DAD2DE07FD60C756B0DB678BA8627B
+718C459399C34391C94326407BD44549F6E6BEA3097E796F9D5567A74CD3DD06
+CD66C78C171434C4D8D071E6680047206AB5B0700B8958D9990102E6F4201FFF
+7AA8A4F9F268F2E563E0A84E3447C5E7AAFDC681BB3ABACF428B39F4DEC69E87
+709E1E587A9291818C94A400AF2CBD3BDFE018FEC68FB52E8AB97384EE700D45
+AEDBE0A79875084452956D3E8D08695D5CF33DC65A08A2E0CE49846F8D658B1D
+290B6590590744C3BAA07B6ADD4495F84CA5EF2068564BBD28EF31E99B3EF96B
+D4DA128EBF30B5E71287EF4BE6F11F3968A6AA9FB8E039024BECD94783DEDDDF
+3E502CA25E421DF43503147F5C40EA9F64B43EF05371D7D02CAAE4BF9C3068C1
+0E4C121DB30233561855CC115A2F1C71205E13044BFDEB88A9A26FA7DA776760
+6F6232121EC7A05E952E3EFEA5C9BDF95544F47FCA6F9D49216BC1E6357FFD14
+FE08D4C9F858511333BB1391778D5F8EF4262236A3121E7CFDCE346A11585A0C
+ED8179AD3523C567A694592DCF7A738AB11BC911513A9B429070B632A5AEED18
+912DD44E8A951515C25DFEC549FA08C16DBE0C080A0741BB722083EC4D728B63
+51EF23AEA4D15015E4803F8B38EF5D7A4DA5887959AC0E1EBEBFEF3E7103D66C
+0D1C944094B48153CBECA0CC877300D97CFC241FF4C5BE3BFAE5D9DA8BF64E3E
+8F8A7124BC2A8F690503275CFD9754298D6401ECA1CEF653EB7A8BD1E8C27E63
+09797587800F513BB09F4962EFD8A548938343FEF44114E632D7D9F305FF7D9B
+B043B271955E971EAE369CBC1A569B673C636E1F3E8BCCC9A7EE73745BB4F6DF
+63E80317AE5FDBBEAE0AB05C5707910CD183CBAE9443A82D9C622DDD8C77E236
+4337FA68FEEFA8D6ECF883DC485FCA75F79579D2C3C40CFE131BE8A25BFE360E
+9BF74B6F008041D1DC288BFDC72E7554B9C35A05C802FCF91842CE6D16B35A17
+E4486E436A0C04F7D291CD06E87C7D581D4FA8D93C12F5FB46901264DF9A8491
+065D87BA1A715E107954E99896F46315CF212205CB224C91E8E67963D36AD1E6
+1A400BBB3FC39A1B94A577FB13B3EC5D1DD8D069FD2B946E6740D21D7FAA834C
+6CA596D24CF483EEED47AB8C11BF7BE8C186C112964DC28327C204F27B5242B0
+A62860BA758A6F57287D2F8FAFBB95BA694434C5E712A61AC48AA10792B51530
+7B90E890483101DEF6EFF5D6307CC24DB5D29CFFD204D43CBC41F30BD1940C80
+6BABE56764FE8FB6D14DA7B521255BA7A7FB773FA937D0A862892EFAA8713541
+4C18EE80297873AF7194C73C4AF15EDC9E394C7BD1E6840009CD40D880287C33
+D21082789DAB3E97A9A1CEB69139DA7B1195286914CDE1568CA47BB86F33DC32
+AA54AA2A59002F8E71E6592674DA1699E70D1B47932F068278B7B27D91703059
+7D85FFB3B8A554577E1C6DAE72F6DEF4757F62B9C49B070FCF09209BF8768C44
+D9C410F015DFD1E06ADAC5D886A2C887F83AB992FABAD38EABFC4169369BAE6B
+0B2D01785F129E1774EAE997A399F025C8C4CF4922AD2DFC9ACEFDB302791EAF
+D49F3B69B612A2B62EFB321E9A19406F021A514E6F503A8D0D9E349916C2C170
+F000C0F5C933396F8083413D5B5AC0F92E2FE4D552107D2DCADE18148C5CF45D
+05CAA1F51E0E00AE0C0C947E62A4BBB46A1797E3D734CD825156C60DC85E23D7
+902D68CC9C70611B37BB0EEFCE4940640D53599237EB0553F689791A736B37FF
+2F80A46C8724829E24975EC26AF48B3B1635BA37FB93B11B5B1663FDBC3E57AA
+1A741DC449EF31C1FB3809AEBA79424C2A96FF0E7D8772FEF6DC790177CFF682
+8F3825E325A61C9FA69E48BE691EA1D0CAEC56005764DFFFA6BD28BF4CEBA8BA
+9937703BA66A82F00AD51ABCAE57A0889179E5A8C4567ECAB71CDA45D2F466BC
+2BB9BE3DC301AD04C989EC67B9167136E38EB9B7BDEB8FDF84BF10AD349FF6D8
+ED5464AD98824105280822B9284F2AD285E05CADD239F64E32777275DCA340A6
+9DE9E99C12B97B9FAA8CC225419661542EC0D6D9AA8DDE52172233EE8498075C
+1F2DB1CA96A8B97209B24CA18F8D65D9D0AC7281EED9CA9035FC8DFD1B956772
+5DD851936729D332D4CE9951F7CEDF50FC5D08C56F4FA5EA38FF38C447C01ACD
+A462C73A1C726563AEBD55E9801B32586958C727C260A5549BDC25CE2B98FB38
+BC38110F20411E2B572E79552C396BEDE7230E9F677477682DD5721FA789C4AD
+A524A520DF586772C6406685C5FAC5F8C090357F38B8139DE9D4233A28574BB0
+B20E85EF2405FC38C69378EAC55C8C2A18E7CCD2DE3F6A2E884CA35AC561F9E5
+4055C29334DA2A5F4486150C1AF0B131DFFD78F67F4F286E796E82C723E6186A
+6256A59680A162BAF502C3D06BE15B567A9FE32D3DBA21B4F074A3EC20969D9B
+102E64B8A37A238025DDD2147731924ACDD2E7F2985DAE32BB8C6639B64CDC8B
+1B3B847B7E0BA43022F9212F6B80A6C1E0F00C4FA97E37F3BC26B7CFA0D4A511
+9330625B616C314F926A18D5AA3B37DFBAB3F1571CB4906FAB3293C24BDEE506
+07A5695CC3904127E4291E2F19815D7F9C53F5CB1A02019257E68F150513B75F
+188CDD36AD1AB18823951F5237A599B0CD3ABE320D2C2797520CF4F51AAAEDC4
+1169B1AED761B16A25C1A9423277FDEBC3373497004367ABEBA3AD233FC8787F
+92A4A4965BF5FD4F5F4EEDA82EEA3BED70B0E5A9B0998042E30AB0425216BFE5
+8AD806CA26F1DA26B41445FD9690E6E04A86D45E1E2CE22E3229614F9C07F585
+F57C2CF04E830EA2C8ADD6E126C124F459D66A1E575E7ADF7C5963FC3FE74643
+F6F60133CBA6ABAFD3539AB858BCEEA803D5260F0DB6E23D7D1F0EC2FB47A98F
+2A9E327B415BEED3D0CEAB1A2737D36C2E3A3DFDFBC0D75A9A2D251930FDFD5F
+7B9170FDEA176AF97EB70523673A39C1676D113EC7F0A760FABD6D939ECD02A2
+8609EFDCDAFE070D0526AF58883B9205E11BB726259FD97E6AA93FB05B296080
+DEC8CC8655EBDCCAFB6BD42F20225EB34A8CE6F881C0600B63AE58CD3E91927B
+705262B48498E76901EF7CD8A4607FD7A8BFA4EB14A3A4E78439E074A3CD1B6C
+56C63FDC56C2A29E1790A354EF0595657A022E686C0BCB106A432A242794C869
+3B468E7DBC9DD8974EEFFDBEB21AB1FC4963E9D70B7F69B62F6847628CAA171C
+E86C0D589BC6F584C5A6035D375D215FCE2DE7E03640BA7F2983C1FE2EFDA675
+44996DDE255EDE2E0EA1EA461B178B764066F0738084D1DC0A717ED3C5E002BC
+18FC3C6AFC5F415A25AFAFBCDD5E4E304EEB56EAB5448BAA447EA9B912B725B4
+CB0E3DCCBC333C7F0944545CD7C06C7927F2715F2C32EA4861FF7EAD682D63AD
+6FE869229940972740C078A9B14D5DD30263F690ED7C4AA1BCD48546467EAAEF
+53F205D24EC5A8185B965725E433E6B1F9D829D09D3E32186D7F069B05ED3536
+AE371CCF2A86F507D775CBBEB073703530EB9C13ADB6625AE485F47FC5842D64
+79074FEBB50E803F77809076725FEED43D4107B01B31341D32414FE87CA93A23
+2621F7264FFD3EF958CE17087C76C8EA88C1D8CD651090F9579C11584B59FBC3
+4339692A52ACFAFB71F8F9AC7445AAB7D6EBF9CE4E6D5847F1348B84DC01EC9E
+14659686F6C1F9C4DDEFE3FECC758F22B62DE54BD2CE3199E7B73BB7FB00D673
+5E6CE00B063FA54833E574320107613502A20B188A7649BEE66022EF48F02370
+659D37403C1D2BC66235B01BBD898C085F7BA962240C83ACA240289A57D14FC5
+E1126951E7D4B3585A3BD1F5CA63F63861F203F4893B95ED75102449DBCB8C9E
+26092452809C6C55B1960CCE65C5806D5B1A3CD8AD1209B7ECBD45B2E663C318
+4F47A682A200A866D62D909D4A25F4B1E4EC07DB0EF30AA950563BB52B201080
+BB6F6CC7BFF7BD8D5AB947E975CDFF7EEA4C234CEB57ECFD51F712AB681C51C1
+CD440E61A48A339F7BEDA750C7986A870C53E1A42B2EB9575FE127A4344B2F3A
+2925721FB1C840973D28C3E490DC2DFCC50E7D5B333C486E8DEF33A08902AC1D
+1AD15691AE5C308DAC6E9E4C6DBC8E91A0E62CE7553F7EE677C236D5FC2AD64B
+93C61D22E39B21A94A5FAB0D1159644B5895C7AB28D67F04158CEBAADFE921F8
+708DF7780BBB53353BBC356C5A30B1311DEBF3032667E6F58F3140B500BC1389
+2E268107E7A2DD447287EFB49812AA97253A993E155A0A03F8C59ADCDFD8E677
+568B69CEA669882833B1E74B658F756CBB2F8CBE47F5EC60BD15E198A3C3F600
+3CFFF12E11F7C18A38FEA39D14D2B2044702AD28B4841B7CC4DD5FF15A2EFE00
+B7977EBC290A82EBE2382DEBED2021151A954B2416BFFC75CF127BF2A4AFA2F9
+94CD77EA8F7918AB471D33AF1EF480C7C067FDC4CB8122C6F55C1E92E7AA0197
+82C1DE1C0610903A9C8A4A6B4217AD559DC4E33A0E8A3801CF31B0195AAB7D77
+751B357EB2ACAD4A52B06A0DBED89A2FC0428CF99FD570B4E36575A35AED7F28
+27C14CE9DCF1497EF8E0D0A7C58C00B1BD12F76B50FA3FF98774F0EC9CF92717
+02E79D948D45BF5A2FDB5B5956AB31C2833C381931C002741B669ABC0A20DD35
+30F4CF3D0307D145E90DEDB9275E6B892BCBD22BCC95DEBCECA270823233BDCB
+85E12C13C7EAC5590AF06926CBF83EE4E37B98D1105F04C1BCFAB78848BCECCB
+CEC7067C7809F30ABD4AFECB1B88AC31C769BCC3FEF5F1F503A1EB3DE899E58D
+368B0A1E545C50DBF0427A9CE238285870A5BE619BB212EF6EC7E417CE1A0FEA
+DB00A94FDAE477DE1F39C91160292620A5A6FA48594FFAA1DE64121864295E14
+C4D5096386C52F99094C2002476C5BF383BC0C55FA377DF0023BBF3F52D27620
+2F22A07F251551E3A31E53ADE4F5D5C9C1EA12720D95C6A0896D87FE2E703B46
+3004D91E86F41559987DC5763EAB5155DB1F8320266A405A39D6E274A3D18C11
+40D21954A786789F673BCD0FF0938DC68421A2BE201DEBE3570BE1DA4911BCB4
+9B219582E3628E1C4FF88262898D160C58E9D0D5A86571CE87A0269977745E6F
+49652DAB033108692C9B1C220EE07F72CC52BAA36BB1D7209B1A11B2CAD3CE67
+4F14B87DA489C2EFFE0E2DC1A2B6B05A8660D5DDE1089C7E7C899F2A528A6CE5
+A025BF973D8959EF4434D2C70F77D826F85009E5F909B88233A8CE812A5960C5
+05243F44B5355AF815A5AABA6511F5F3FA2B29F37A4E29EE575845F7F05BF087
+5B3AAE4637D0A6908A5086756B3BEDE605A718F5E5B47520885F283C0AB28B0D
+9F277CE965E22195CA1DD4A75E4DE0597C374FC9A0343BB87D675D94EF9D87FE
+89ADF37F61B9168047EF1A2234811CAAC507F27235E4634CA4C2B2999A575C69
+3FE19422C170F8142F3DB38AEE76D1BC4A8C2328E987CEB840CAF69CD0F0007B
+D3516F7228013D79C891BEEF835235CD6920FCC6A604648570277F104287D6AD
+75511E5D835319E1933FF896CBCC559A5ABF2572C430B8EA62ED314DED16C2EB
+A5D66CA97EC43FAC0520A3295650C1739D91539C99169A3592BF84E8BB378883
+8B3DB2BA623F01524B180118CAFDCBEBBBA3A760BBBDF2F7AC62024B298166BC
+534E7EA23642DCC4A800A0D605D88909C1840DFF31E8E9A20EAE691E07010C0B
+7C4386507038CA310ADF5A715B1525F796BE864DA5E0B8CDCCBD595D7E31F9CA
+2E85E80D313BC9DBB3EC41C8FA1632F0E75F63F137FD5BA01BE67A440F81A72B
+94A1E913CD4474E1C77A3E6B81E5F058BF583C6668A65082F60CDFE05691ABE2
+4D10B4D0CD546BA8638574A24841BD606BABFA018FAFECFA2F5D4293373315C4
+83E6D6B36B15D2CCE993C19AF2847C459A9FBA9AE47BAFF41CC6D3ECCB692860
+7C1EAE7B393C5690B72B5D4C6B2FAADBFC702E026ADEC06710E7592CD05E3D72
+022A7E117856F8D4644122045C1478728A48CE386D9A22F2C653C6462D833ED3
+DB934E4327E69C9A625200E215FD9A399779DCA7584ECBCD0C4C30E0A7DE7EE7
+941B838664EC4DF49B1C70D36BEA5FA0C08EC780AABFE652EE05C088B4B59BF9
+D794D627FE660D813FBA76A9B13A216965C8D4ECC31F9CC72FF1DB04F55BE4C5
+9312C84EAEDE62E6C9BDD074D38EB7147FE6645597413E8AC10340AE96D4E84D
+14FBEDBB96EC767268B7F0D7F17FA69A395E7B088C43CEDE2DD934B96072AB36
+BCCA43FBB6596791FE9EA006FFA4DC3E28384A124D5C5E1C1640164559FB44E4
+DE5B1CCE7962008275C41EF90DA2FF73BC92D37295DA4B47EE7663AD3FA3081E
+C6541F337A35F616F831B5BAF3289B2E6DA16960DF72F1F03F19BAEA35F8400B
+A1ACE52D96A11FE3A368E476C5BF7B5466929251A08ADAD3E2034DDE0B9CDF8C
+24B1B614C42EBAEB492ABE6667249F53C35D655D4536CD086258538A407C6394
+BFF608509B387040144662A2C510522CDB60B1C44C826FEBCA5ED65FC5B9992F
+7053C423D8E9FB4B2A92AE3E373AF9F979080C4C40F2B581A83FFA750C5835F4
+17F6630E3D98EB28A37EB425F1DCFA27F4995605A82BD9F4C3FD26A2C6692B6E
+C7C3F47741E0C8427FA2511D5FDB08F03555E7D4B2CFE592EF027D7FF58199A6
+3C8759C332C66EAF33156A1C3276053BA1F5052857F1F01F5147EAA70C126912
+9D54B91270EE22DEACBFC154D028F612E7D729ECD5D4811B3B648E4A13112FE2
+3ACE506353F913D55845453B85747DB452F0CC59FDF5220B5EDE973D34537180
+753DDF320DCE92FB09449F685AF03D72F9964F
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -2188,8 +2193,8 @@ TeXDict begin 55387786 39139632 1000 600 600 (fr-refcard.dvi)
 36 51[26 45[{}18 66.4176 /CMTI8 rf /Fc 242[61 13[{}1
 49.8132 /CMSY6 rf /Fd 133[27 32 1[43 32 34 24 24 24 32
 34 30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 10[45
-45 1[34 2[41 1[45 54 2[31 22 1[47 39 41 1[43 42 45 10[30
-30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{}51
+45 1[34 2[41 1[45 54 2[31 22 1[47 39 41 1[43 42 45 9[30
+30 30 1[30 30 30 30 1[18 21 18 4[18 14[27 4[30 30 18[{}52
 49.8132 /CMR6 rf /Fe 135[43 1[43 45 32 32 34 43 45 41
 45 68 23 2[23 45 41 25 37 45 36 45 40 51[27 5[23 19[41
 41 5[45 12[{}26 66.4176 /CMBX8 rf /Ff 130[35 35 35 35
@@ -2290,7 +2295,7 @@ Ff(C-s)g Fh(ou)g Ff(C-r)h Fh(p)r(our)e(r)n(\023)-33 b(ep)n(\023)g(eter)
 1064 y(quelconque.)67 b(Si)34 b(Emacs)h(est)h(encore)g(en)f(train)g(de)
 g(c)n(herc)n(her,)j Ff(C-g)1746 1128 y Fh(n'ann)n(ule)24
 b(que)h(ce)f(qui)f(n'a)h(pas)e(\023)-33 b(et)n(\023)g(e)25
-b(fait.)1855 1367 y Fd(c)1838 1369 y Fc(\015)20 b Fd(2006)j(F)-5
+b(fait.)1855 1367 y Fd(c)1838 1369 y Fc(\015)20 b Fd(2007)j(F)-5
 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20 b(Inc.)27
 b(P)n(ermissions)21 b(au)g(dos.)27 b(v2.3)1746 1569 y
 Fg(D)n(\023)-55 b(eplacemen)m(ts)1746 1727 y Fe(en)n(tit)n(\023)-39
@@ -2654,7 +2659,7 @@ Ff(interactive)h Fh(indique)d(commen)n(t)h(lire)e(in)n(teractiv)n(e-)
 b(F)-6 b(aites)28 b Ff(C-h)36 b(f)f(interactive)30 b
 Fh(p)r(our)e(plus)e(de)1746 3731 y(pr)n(\023)-33 b(ecisions.)2039
 3811 y Fd(Cop)n(yrigh)n(t)2342 3809 y(c)2325 3811 y Fc(\015)21
-b Fd(2006)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
+b Fd(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
 b(Inc.)2179 3862 y(v2.3)h(p)r(our)f(GNU)g(Emacs)h(v)n(ersion)h(22,)f
 (2006)2309 3913 y(conception)g(de)f(Stephen)g(Gildea)2220
 3976 y(traduction)h(fran\030)-27 b(caise)21 b(d')2831
diff --git a/etc/fr-refcard.tex b/etc/fr-refcard.tex
index 48c0c927f51..3fa92ccb8b8 100644
--- a/etc/fr-refcard.tex
+++ b/etc/fr-refcard.tex
@@ -14,8 +14,8 @@
 \letterpaper=1
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -65,7 +65,9 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{2.3}
-\def\year{2006}
+\def\versionemacs{22}
+\def\versionyear{2006}          % latest update
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -74,7 +76,8 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} pour GNU Emacs version 22, \year}
+\centerline{v\versionnumber{} pour GNU Emacs version \versionemacs,
+  \versionyear}
 \centerline{conception de Stephen Gildea}
 \centerline{traduction fran\c{c}aise d'\'Eric Jacoboni}
 
@@ -278,11 +281,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
 
 \title{Carte de r\'ef\'erence de GNU Emacs}
 
-\centerline{(pour la version 22)}
+\centerline{(pour la version \versionemacs)}
 
 \section{Lancement d'Emacs}
 
-Pour lancer GNU Emacs 22, il suffit de taper son nom : \kbd{emacs}
+Pour lancer GNU Emacs \versionemacs, il suffit de taper son nom : \kbd{emacs}
 
 Pour charger un fichier \`a \'editer, voir Fichiers, ci-dessous.
 
diff --git a/etc/fr-survival.tex b/etc/fr-survival.tex
index 5c99fb27c49..ce338219128 100644
--- a/etc/fr-survival.tex
+++ b/etc/fr-survival.tex
@@ -22,8 +22,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -45,12 +45,14 @@
 % Translated to french by \'Eric Jacoboni <jaco@teaser.fr> in November 2001
 
 \def\versionnumber{1.0}
-\def\year{2006}
+\def\versionemacs{21}
+\def\versiondate{Avril 2000}    % latest update
+\def\year{2007}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
     Copyright \year\ Free Software Foundation, Inc.\break
-    Version \versionnumber{} pour GNU Emacs 21, Avril 2000\break
+    Version \versionnumber{} pour GNU Emacs \versionemacs, \versiondate\break
     Auteur W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Traduction fran\c{c}aise \'Eric Jacoboni (jaco@teaser.fr)
 
@@ -159,7 +161,7 @@
 %**end of header
 
 
-\title{Carte de survie pour GNU\ \ Emacs}{version 21}
+\title{Carte de survie pour GNU\ \ Emacs}{version \versionemacs}
 
 Dans ce qui suit, \kbd{C-z} signifie qu'il faut appuyer sur la touche
 `\kbd{z}' tout en maintenant la touche {\it Ctrl}\ \
diff --git a/etc/gnus-refcard.tex b/etc/gnus-refcard.tex
index 106e3dc6212..7fda89fdb94 100644
--- a/etc/gnus-refcard.tex
+++ b/etc/gnus-refcard.tex
@@ -111,13 +111,13 @@
 \newcommand*{\Logo}[1]{\centerline{%
     \includegraphics[width=\logoscale\logowidth]{gnus-logo}}}
 
+%%  Contributions by:
+%% 1995 Vladimir Alexiev <vladimir@cs.ualberta.ca>
+%% 2000 Felix Natter <fnatter@gmx.net>
 \newcommand{\Copyright}{%
   \begin{center}
-    Copyright \copyright\ 1995, 2002, 2003, 2004,
-       2005, 2006 Free Software Foundation, Inc.\\*
-    Copyright \copyright\ 1995 Vladimir Alexiev
-    $<$vladimir@cs.ualberta.ca$>$.\\*
-    Copyright \copyright\ 2000 Felix Natter $<$fnatter@gmx.net$>$.\\*
+    Copyright \copyright\ 1995, 2000, 2002, 2003, 2004,
+       2005, 2006, 2007  Free Software Foundation, Inc.\\*
     Copyright \copyright\ 2001, 2002, 2003, 2005 \author.\\*
     Created from the Gnus manual Copyright \copyright\ 1994 Lars Magne
     Ingebrigtsen.\\*
diff --git a/etc/gnus-tut.txt b/etc/gnus-tut.txt
index 43a1f647488..0505b49f10b 100644
--- a/etc/gnus-tut.txt
+++ b/etc/gnus-tut.txt
@@ -24,8 +24,8 @@ was done by moi, yours truly, your humble servant, Lars Magne
 Ingebrigtsen.  If you have a WWW browser, you can investigate to your
 heart's delight at <URL:http://www.ifi.uio.no/~larsi/larsi.html>.
 
-;; Copyright (C) 1995, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@ifi.uio.no>
 ;; Keywords: news
diff --git a/etc/grep.txt b/etc/grep.txt
index 010230fcb46..ed28c773904 100644
--- a/etc/grep.txt
+++ b/etc/grep.txt
@@ -84,8 +84,8 @@ grep -nH -e "xyzxyz" ../info/*
 
 
 
-Copyright (c) 2005, 2006
-Free software Foundation, Inc.
+Copyright (C) 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 COPYING PERMISSIONS:
 
diff --git a/etc/ms-7bkermit b/etc/ms-7bkermit
index b239e942293..091264fee14 100644
--- a/etc/ms-7bkermit
+++ b/etc/ms-7bkermit
@@ -1,5 +1,5 @@
-;;; Copyright (c) 1999, 2003, 2006
-;;; Free Software Foundation, Inc.
+;;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;;   Free Software Foundation, Inc.
 
 ;;; This file is designed for 7-bit connections.
 ;;; Use the file ms-kermit if you have an 8-bit connection.
diff --git a/etc/orgcard.tex b/etc/orgcard.tex
index 141e786345d..51388bc6b1e 100644
--- a/etc/orgcard.tex
+++ b/etc/orgcard.tex
@@ -1,6 +1,7 @@
 % Reference Card for Org Mode
 \def\orgversionnumber{4.56}
-\def\year{2006}
+\def\versionyear{2006}          % latest update
+\def\year{2007}                 % latest copyright year
 %
 %**start of header
 \newcount\columnsperpage
@@ -20,7 +21,9 @@
 
 \columnsperpage=3
 
-% Copyright (c) 2004 Philip Rooke, 2005, 2006 Free Software Foundation
+% Copyright (C) 2004 Philip Rooke
+% Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
+% FIXME - no Rooke in copyright.list
 
 % GNU Emacs is free software; you can redistribute it and/or modify
 % it under the terms of the GNU General Public License as published by
@@ -61,13 +64,13 @@
 % for their many good ideas.
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
-  \centerline{\small \copyright\ 2004, 2005, 2006\ Free Software Foundation, Inc.
+  \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
   Permissions on back.  v\orgversionnumber}}
 
 \def\copyrightnotice{
 \vskip 1ex plus 100 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \year}
+\centerline{v\orgversionnumber{} for Org-Mode \orgversionnumber{}, \versionyear}
 \centerline{Author: Philip Rooke}
 \centerline{based on refcard design and format by Stephen Gildea}
 
diff --git a/etc/pl-refcard.tex b/etc/pl-refcard.tex
index 62dca4458c5..2f55402aa3d 100644
--- a/etc/pl-refcard.tex
+++ b/etc/pl-refcard.tex
@@ -32,8 +32,8 @@
 
 \columnsperpage=2
 
-% Copyright (C) 1999, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -74,7 +74,9 @@
 % If there were room, it would be nice to see a section on Dired.
 
 \def\versionnumber{1.2}
-\def\year{2006}
+\def\versionemacs{22}
+\def\versiondate{czerwiec 2006} % latest update
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -83,8 +85,8 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{Wersja \versionnumber{} dla GNU Emacsa 22,
-  czerwiec 2006}
+\centerline{Wersja \versionnumber{} dla GNU Emacsa \versionemacs,
+  \versiondate}
 \centerline{projekt Stephen Gildea}
 \centerline{t/lumaczenie W/lodek Bzyl}
 
@@ -311,12 +313,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 %\title{GNU Emacs Reference Card}
 \title{Przegl/ad polece/n GNU Emacsa}
 
-\centerline{(dla wersji 22)}
+\centerline{(dla wersji \versionemacs)}
 
 \section{Uruchamianie Emacsa}
 
 %To enter GNU Emacs 20, just type its name: \kbd{emacs}
-Aby uruchomi/c GNU Emacsa 22, napisz jego nazw/e: \kbd{emacs}
+Aby uruchomi/c GNU Emacsa \versionemacs, napisz jego nazw/e: \kbd{emacs}
 
 %To read in a file to edit, see Files, below.
 Aby wczyta/c plik do edycji, patrz rozdzia/l {\bf Pliki} poni/zej.
diff --git a/etc/ps-prin0.ps b/etc/ps-prin0.ps
index 952c31d2b2e..ffa7d39dfe7 100644
--- a/etc/ps-prin0.ps
+++ b/etc/ps-prin0.ps
@@ -1,7 +1,8 @@
 % === BEGIN ps-print prologue 0
 % version: 6.0
 
-% Copyright (C) 2000, 2001  Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
diff --git a/etc/ps-prin1.ps b/etc/ps-prin1.ps
index 118133ba73b..977b2e91f15 100644
--- a/etc/ps-prin1.ps
+++ b/etc/ps-prin1.ps
@@ -1,7 +1,8 @@
 % === BEGIN ps-print prologue 1
-% version: 6.0
+% version: 6.1
 
-% Copyright (C) 2000, 2001, 2002, 2003, 2004  Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
 %
 % This file is part of GNU Emacs.
 %
@@ -429,14 +430,16 @@ StandardEncoding 46 82 getinterval aload pop
 % stack: --
 /printBackground{
   /BackgroundColor where{
+    /LHg LineHeight 0.65 mul def
+    /PHg PrintHeight LHg add def
     pop gsave BackgroundColor SetColor
     NumberOfColumns{
      gsave
-     0 LineHeight 0.65 mul rmoveto
+     0 LHg rmoveto
      PrintWidth 0 rlineto
-     0 PrintHeight neg rlineto
+     0 PHg neg rlineto
      PrintWidth neg 0 rlineto
-     0 PrintHeight rlineto
+     0 PHg rlineto
      fill
      grestore
      PrintWidth InterColumn add 0 rmoveto
diff --git a/etc/pt-br-refcard.ps b/etc/pt-br-refcard.ps
index 93c91919e52..d7ce686f12d 100644
--- a/etc/pt-br-refcard.ps
+++ b/etc/pt-br-refcard.ps
@@ -1,5 +1,5 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: pt-br-refcard.dvi
 %%Pages: 2
 %%PageOrder: Ascend
@@ -11,7 +11,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t landscape pt-br-refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2006.06.28:1522
+%DVIPSSource:  TeX output 2007.01.20:1524
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -418,6 +418,7 @@ dup 50 /two put
 dup 51 /three put
 dup 53 /five put
 dup 54 /six put
+dup 55 /seven put
 dup 65 /A put
 dup 66 /B put
 dup 67 /C put
@@ -480,221 +481,225 @@ B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E10A31C7011C0FFA
 99B797CE549B5C45238DD0FADD6B99D233AC69282DF0D91EA2DBD08CE0083904
 A6D968D5AE3BD159D01BDFF42D16111BC0A517C66B43972080D9DD4F3B9AE7FB
 11B035CE715C1218B2D779761D8D7E9DEBE277531BD58F313EBD27E33BEF9DC5
-50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB600A22D03B
-86A088CED7AE528182D2EBF4D351FD835B5DAB2036F44604002D0E21510DDCEA
-F8DD36174C2CFEBAE2D183407AAC7D4D52D51D5B2890CD3B23A88228089D26BD
-6E7ED4B31A60C45C7D8C00274A812ECF682228F241C13C41497BEAE1DB58C3B8
-3EED1B4F48D1A4706D71EB098C4FD67CC7890957724C12067CA54A2140855928
-E6197231734CB46E3EF820A1C19A6AE55A2547EDAA9994B59311C2D02BAF4950
-2A8739E2E60A1490884101F56392D67FBCB271783118B2568E2DD484465B899A
-8312F466470B4A490266852CA56F7F56991A746CCD5A365EAFD700D47D11860E
-2E2B21C90AA8B3F9915F81F0E2C2DF98D942F3CEA2300F2B9F6BC99FE21F2966
-AA932F222C35EECC2520F10C110D6FF9A32EF56A812D3760B54B451C79D6FE5F
-3F93D3E5F9E4D56096A92B9E953F160551BB6FE26206D6A317219222AA58FE76
-6C758416537175D1F7DDA512DAE5A4794216C90B561F6C29C44FAAA5EB719F20
-43333A0605C0A095D8AAC862DE53BFE3EA97A756193E9E74E7604AB5EEFC1E7C
-00888CF0F286073143ABD034A1BD66E81E588FF34930DA0421D01B48A71EF115
-BD68ECA6C15DB673CF17821A79484DA091B0FD42820B35ACBCC4E2873C3B4950
-F76EFCE8F0A80EAE5086450D76847F299FFEFAFB731C72B63DE42CDB342B1691
-0CAF1AD419B1B3102894D78C3ADE69C39ACD063566B0118C0E127D4A7C013D93
-C3F3A8D55B3A6BCFA37FC6796CB40EA156958F27435A2832A5FE55A08B76E258
-9440C4741B30E211BD4216DF1EDEE02D168A398B6769F8D165B7D7225D278BA8
-994DDDE391F57EB890156023E6E3D56E22843F3DCC582F7E6C571EF2BB436631
-A7E7738ADDAE7A0433C43A8A3B90AD8952E976F348973F79797E5B68469542DE
-D610798FAFF13B24AFA2574BF898DBD661417C41BD0FB6D448CE99BFABB91117
-E8CDCADFAD71D882E51DF28B7D04624615C826CBFA745CD903E2303337AAA886
-DF481C65C7D914DE22A026BA75D232481DC320B89A9A2F6DA1D9E54C48CDCDF3
-F657A66DFEEA1FEB0E98A71666F115BAC1286D5E0273BE8A67ECEDAA1BFA4921
-E96E67138F28919D708719107D48D8F0C4E4DDBDFE6DEC21C27F260DF7A46327
-D924F8918E2F0837760BEC3666C7D5D60A9F2A7EB0DFAECA1AE4A79C15CEBDA9
-7592B665DFC923D1C6ECB7A3444016A1F9760493BA1D71232BF2576DB84CF966
-7A7466A55FDF764D4BD7810541055B989E8A8189ACA63014CF403E3926C4F455
-81E25361FE1339777B597EFF1CD63F007EE735B9049315DE035415170248B359
-EF4A0BD6960E23D3318A59E11190AFF749ECEBC81B0D3E26795B6369309ABA76
-C1E2EA4EC1DB3065E4618BFDE7729263920EFE5236EA355BC30C95C62718EDDC
-69C3824B6A450B37974FE23553D0E1ECA572155E53DFCAD1E4F7C40FCCEB42F0
-8A41A4F516B5937D75FBB86BF290BB6548FF327853DC5A25D002A381A13DBAE8
-6CFD76979CBD26A4F4D97A791BC1E65AC1B34F43AA12D9F5E66E85E368AC33DA
-2626EE4E399623D6449037D555E35E0A22E4AABC91B360D7A961FD335E37FAD1
-46DB866561D431B05A65BE91077FEBAD52EA5587D5DB86CBD753EB270B4AFDA6
-68C0F1232BDBC07B5D7E2B58AD4FCE8D004149EA212653A83BCA85A1BC8E5AD7
-D15D165521AB6377FA20A09413403C79B1266F49D983AD0BC50AB766F1CEC782
-4609F22694540DBCF5FD113626C89BDCAA59F4905D07BABD08BA49F976C0A79F
-94A77AD26783AA9BC47B8A11CAA11090D09A88BA948844A45BCEDD3CDE0EF114
-2E16ABAC0D90E7B7345C04B53577218009E67C7B7010AD8DB0FF1073DE31C770
-670C6619622031490EA2A2D1A9FB80DD21A5ACC526C2BF0D999651B8E22A28FD
-47B4708B288F5BED8E5DFBE57FB3FB33F00657B8544CDF6CAFE1A3BBDA9F2296
-3C5BEC4351412CCB9AB6F450188D307B9AC70CA7D9DD184414833868B27BCF62
-C8CDDF23A7D796D0A1F8155E66EC9D7B35BF0FBE185103A37EC12981EADBD16D
-70CDB2D685FC168F08AE39F375739ADFC915A63C6A7246D164A12569155B956D
-A7A5795A6EA9D4FDB0AFE54C63CBC01D5C338B68DAC3D23B110527B91BC0527A
-30D7E8B7DB2A6CA19B7C71D78D71C41AE0557E0A9CF2F3285F53CEF69DC3C91A
-B3EE632FC1416B4B36CD2FDB8BAE850FAC5E9E0B7B57534A8D86948074AB123B
-B39EBA873F819AA42D36D4E07E2507EDBB3144337A743FB436545938E4DEABF7
-03EF9E9752B4DF79396023282325AC3AD52F42430A97C54287C94C3C910D025E
-B6C40DC9A11D864614393CE973DE186B99F4B3C0F33CA18E1D30F8E8EA70223A
-36853FEC29C0F96B59A6F59C0A33712B7053001FD554D23D0FF848FEB3C7EC9F
-7455645E42209FD5B8CC08A4A882E34275F6EEC5B16E7A7DE6C9D8941EB6BB46
-ABA35AA067E0439AFFF7DF7A660D66C8503BF35EC83C32270E04512FFA90618F
-6825695BB8ED9F97C4FA706BB84B66A9BB210628EBE19ADB36D679CF9E7B3BFA
-4D4764BBB31682A14FD537266E2CE1F4640131D324382542FF8B8CD9BB108B69
-6655FE8FCFB277A88C58A7E2AFAC9B740D840EDF1DFC50747CD3EA1DC24B050F
-B12404954E42E14DB6092B38F32CBAB9546A9784BFF7FB16FC0F3D2875A35A16
-75EEEA82FDD3DE0BAFF2C26BD37D229CA06A002529D27EAB41E20818ADFBBB5F
-0AAA37BB95CAD96A3F700C2E5B7DD988E89049051077CBDC2DDA592E2B99C090
-53C7D459D85A72B01880F10F9919777AAC2A3133B8A7CC5926ACB6C87B0552BE
-D310D8E86E5F4B142850D45664F2CB087C0E7546DA66214DE18E67D1BF098A30
-137068F9E9735933B96B4242E805B0D4E58FC9EDE7330D4217C9315BF6317608
-ECEE1BFED5BE0CBCDBE36119465AF20A6D7A3244652112A1E602C358D5271595
-213FC19C6562678CA6B38A817C0E7CD65FE588A1D9307FACB838C6F5461C0ED0
-888437043743899769E94B7EFD49B022E3A663EB0A00479B5C291937407B52DB
-36E71F524C1C6F4A91BB99E1A824A25C3917DDD42FC2F9DF16BB14C4D28CFFA3
-BBA2BD381C27AD1885F7DECA566B15C763B3B4B3F3EAF3806275D8600FBE4B42
-D1FEBC74147DB1CF64549C9C7DBEED10F44F4D585371BBA5357ACE0BF864231A
-436FEC2C90C94ED01324D5946B89CC05C087CEB96AF03E350BDF44683BDD566F
-0B2C48C4041411EF91A57119C9ADB0F2523477F46F72FEA57ADBB2AC25D3135F
-4F0BD460DC6D8E29830341C64BAB91275E9CA08B713955A5D344EDAEF871DCC1
-B50F30858C3C3666597B73A752E93DF128546D1A1812C5B916AE1F44CB36DBC5
-A26B5C3ECFE3A3E2A013B5BAD5722A8943BD678F651528ED340EBBF59FE47E0F
-D7BC565E44C38FF7697C3F1569C241D339EBC685E7C4D7BBD318B74E6AAFC97C
-49EECA3B147E485F1F2475AE983A18395063BFDE981F51E6A2CDBF1906E499CE
-6C6403DBD85E65E44839011D7E3F62B7504A9CFBF6A5D3C9AFD6BA64E636D7AA
-E43BD83ED14C6EFB36A5233A5D795622583AFAA09000C8557848705231B6ED8E
-5E3FA79173C172763C70AD176F4F3DB0054F144F661F9F028B596107DDA43168
-11B6A56CE4D375EB9F3DACC6EC06F632CAD1D994217FA7DA1C56F681FE7CD0AC
-6CA60BCD21FF4950D20D4A3F11E0662BC1D3CBD8AFE2DFF3DA1C609E0B337B88
-87B6FC6E735DDEFC00C491916F69D0478BA2C346608AECD337AA80031A269380
-45E450ED7BEAADFCBED412595BAC771ED3C1BFA4459A6278EA1F00CF89C9EBDB
-0A43F9CDF70A0AF808CB329CE9907FD5B36C3AF5D1C475AC99A6D6F22596CD42
-1CB7B14123D38D8FD9109438D9F49EC8AF29176204C0A776C60009AA148697B7
-F5496C6FA123F9ADAC59400E139A0B886E110425839B747241A0FD2DCA8621E4
-AC3B71FFB6FF1BD4FC5DF726DA5F383D573640774EC6327F772290930F2656C3
-3D3B1FD3F6B321E0919720F03F3C6EC09D05629549549CAF621EF916071CB6F1
-22625657C27985471E16B21714100F8B80A2C4035C5905C54FF95AB7358117C0
-DE70C0FDA8187FA316189D13A9176C1171A318A81D6A77F0E54D6DE37E5D81C2
-5BF1C7EFFEB8D130DDEA4250C4FF4F1BD1B535A20C3FEF972323F114A9FE90D8
-48162CD532AA3423FDA9AB00AD6754C8216253CE936DAD6AED5BAFAA64921186
-E217F709A73D6083A8D04F11FFF49D2D8AD5A55415043A8EFB32A478B9D70F95
-D9E63A92B53EFAABD9BE62461FEAA541F5CA67FC137E3AAEECB5BE50FF74DAB4
-18BAAE0A7244F072B33F3AF7474EBC681DDB09F4A11663EDA56268CEE9E653D7
-4C068E233BD3F142653DCAEB01E2825AFD6ACC54659F66B21AEE64F66727F033
-B3D7D17C051B17B4BF41DAC5D8FCAB88A36DEB62BCB5D248854EEB8A9EB2672A
-391013A66539BDAAD4189563B45C2FB57EBB9B02BA6845FE2E7D66CED6098014
-2831ED864C366FD3D2A36D9823E84C686D401BF9F01B71CB9864AE245E34D554
-4DE79FEE3B5C74846967D0512CC9FC103DCA3DF48D0D491E70C8A102AB9A92AD
-E868509AEC8134C6587B505139FC438FA994819CD17F108C754DF744F31B0731
-E07BB4F12389EA058127E75F5AC024595CD8477F5FEC80AE9EF2109D0FF15326
-808FC436888B98938234E93EBFB0BB009F8FACC9D0BC0058E37040CED69EDA45
-D08942E834665C0595737BD2C4B18CEF53BE576C03427D0EBD25D335ACCB2473
-63B2FC3FF036BEF8DE2CAA9308E089C591C331DE41017E36914FBC5426358701
-151572CE393FABA2C55D67E7CDC90C78CC6D58C3C6DF6524E5A9804D0D9A0E3B
-DE85F7D0057D2ADBB04FC0077E0080DB404726A8AF5029FAFC05589D835F9ABF
-ABAB4C3B3F66384368D4A2B6B3D6C1EC0FB4121C59D1C5C50CE8E65E988D06AD
-7D03BDC5B095F3BB54A1E4E7DE57601A28BDF6D1C8A26268FE2A8B510CC62B10
-A2F69EF9E8A766BE982C9D791B42C10502F3BE4516D103DE941633F021DDC99E
-4C6BB01CAFD7B886E677897C775485878943292F8592C4DED879058D96EF9F10
-B89C8BFB5567EB7D53B13F1C9893A60D22246DE121C993E9EA563EF972E433BD
-DA1119607CEC7C89145164BBF82194A31932BFA6EA40A2466EF148E9EF09209B
-973714C0DADAD79BC4DC8F767D948AA227F9A12F46262ADC3FC80BD464EB3750
-51CDE98239A728AFBA32DFCDF0E04F1364399121FBA23EA9660E71F1BD2BF976
-F6DB04FE31B3D89112C8EACEC00D8BC0834D63025580AA2A77588FEF5F95BE78
-7AB5A9BBD218B94A7D7E14AE6FC65A615D39058DE4644A126ED9AA1EA03B0A90
-9B8162D84A883D5BA85B83BE8E7EE7B3EFB9F50ACFBFDE4178C4D12D6054A046
-7CC57C142E055B9B822422C9F6E3F2323278AD2299BF211302CAD720BD980980
-4D4EBA8BCE79BC6613EB227A233BF4E0C5B73FD1C424689FECC8949C19E581B5
-9B4534060BB017C315E46E102F9C54830C11CF867846427AFF0293B6EF11970F
-A5E75BB89A8937512FAE083F1BA63BECF2B5ADCF9618F092F461096C565B55B8
-714F9AEAB4F76920A80BB74538CAE55A617C3B265F64E1B1EB19D96DEE120581
-7FDB28B9823C6F5241ED566AA02650CEEA40E6E1A2C6DB55590C5B5572D8F57B
-6AEB288D7869B6A7A50B27E496905CE770852E9BE460CD2D1C723FC7236F92DD
-727B27FAF82E9E7F32BADB7911ED3C6525D913BFA333EBDC18573F1441624892
-EB53FDBB6A945B38FC9C376C3D534127720420E20DF513EF381E2B6B5D5E5C23
-83412BD67435CD6BCE407B8FDFCE4F0A0C35E5DF9DDBB2D1D5D7CB2A45D886DD
-58F908A07FC48C245DC31F28D30FFAD477A1D1AC593FFE8086D05B285C700996
-2CB06125A817D4850B6D3DD246D671554AC1F513932BFACF92A15B75F87DB140
-F5225D5B066A913E6E3631F160CF60F54709FA0DECEBF1BB203F4D902B4351EA
-6369E4872617A98DDA8BFD29E8933D201A09149077EC934C0B082B92244DBBA5
-0E70943FE5E1E8823E0620C857D8A3CE3F857FA05A0DE16D7673E9CF27C847A7
-C8A8DC1F7B8E80A652C47C0AD748A60D76724354AE6D98D37E164B8DF1AA36C3
-04975386BD0C356DE67AF3AF9A2A7C5AB957994A588CD1BF864C64C2D00F8D07
-CCD30A5BEED0371BD23A4622BA3B8EFC35FF8A552E770FB899BFDD7A924F228B
-95B56FDDF795C0D469B399FD0DDC140CDCB61C6A6E30561CA594D7A7A0E86CE6
-B8B4A04D3651CEAF4D11F86CC71A66DA5D66555E27B1D3503E92E368352A0501
-FD045A7D79716CA26C601CA2888B9E57DED1163C821C10EAFE81CF0461A92413
-BB96D2CBD385D17430F3DD50B260F58DB83423E826B9F55FE96ADC290621D17C
-8E4BD1A39007D3EFFB5EC104D2FFC18DF08E16753C26836752BCA0F190882433
-00D86B38E658215741C887494D161A56FDEC75FD5C4E3802318C3D2B72987F3C
-2DD3B75F669F2808F2A9C0880852A4A6236FE8A4AA4FFF753FB8E0403A9926F2
-73A342837512D46102279CC3B105A959516C9CD4FF86C704BD81A2DB5FC1BA55
-4798041822419EE5B201F48A1C182EEB9530D6205677136F81D3D911C98FB220
-C04E1532CBB717A68A5AE74FC5F6ACCFFE1ADBF194551F4E9E8C481C32345FDD
-4615B1EF62FB11C900DF204485616A9D37EA2B41E81EB1854570A07B76C7A064
-2C897C81FF81F703AD989D304CF7AD99F9B900681C935A9FD79C0188B3E2B50F
-19B15C3D95D0319406F917A31676DB06839E0180EB5AF09ACB81A4493CEF52FE
-F606841668FF02BBA4492216D789B6A3C4D9C3FA1310305E9878D7457D7791E2
-4F4749102F501AFF64C3EAF5A90B7B85DF090316D74ACAC512B040C19BBC61CC
-2534597944221052369729EDFF43EDAB917F2117353A8E76A6ED790FAEFD58CD
-7B0F694B156BDCDA89DDF6DCF2B47B71CCC037111432C562AF9C6B6CA1D1BA78
-FCD24F49127731799F7A0C29786E2DAFBE0A24DBFBAE0E9A0DCD44E4649DCB7D
-2916659DB0C65232B5CDCB015827F31A5530489B79A6BB45D68E19E3ED13D3B5
-31DC8454C68CF35E3E8FD307CB301884BDC0A03EDC4F08D4142E20494C59F6EA
-8CE8046D29869C7DDCA98EC906411C57957D1C8FC5404434250881714434B1A4
-5E368208D33D37066855A8BA7318DBEAABC15A83F2E1E50362142A67E443CF03
-E31904E3AC02993022789C3A1638A2056A0D94EC8D64E2A13CED8014C4F4FA51
-8F54801B2BDE7F9F2D0F656A09EB713E8A97793DC5E7F7005241AC5D45BF297E
-429C0CB733F1B86A28AE15CB627C98548AA0DFC81E7F62817989E325324AF65E
-C44FB6A9E42A270D789463D125EEEAFDA57DFD09C94F1354D5FB7B10D8F9F47E
-B6F581CFB243A6B634647EB496F2884CF4DEA98503F4EE906A38173D2A6BDADC
-A21B3C206B15BC842DC7FFB7022AF0F963177F310E971319B9DD3BCE508D4B92
-AB9B051FDB2851502D383EE103C4B0B232E32642E305838BD2D3936387816961
-762185C7152062F990585E9055F94BDBF7BCF46EE1E5D30558BCCB4C996F27B9
-05F40807866C255B81A55D0739041B5275A66F58FC149778AF1D2D90BD83397A
-33AAE594FF0A34FE74F524FEB43A223F8E29D7ACEB1E8838EB0AEE7A5AA401CC
-9D93AA03026E0879E9B7C7BB3FED71492BDDBB28EEE6860FC9E453B0A73982DD
-7AEA950B45736DB924A67B8E88945C2FD9CD01AEAABDFA43D12083AF7D4EB987
-FCD27CA7EDE61E5707AB481BC4B566887884C33C89A2D0B234D6135BBE98ADD7
-90BB22D3BCF19B4C69FAAF0F7946A8E3ACE5C933E2AB65511E861E3C5F9428B7
-B6B61DE712F224237AC705913D0C15E717D00F1913ACF411528D7A0BA81ECC2C
-EE9C5A09F0414B01AA880EAF1776C3C4C965FDA4FF258C2C10ED0C0F894F67DC
-1EC0876ED390CE114D4635F1F7837381CC94F52F4DA12FB9C700B94D75E282BA
-C68B284F09331DCA78387C2F262FFC436FFE0B62F304CBC8BA5C287736ED17EB
-7ACE389AC473AD84A72438FD57D3F8BC75E058F0ABCB016BE01ABC26E1F2EAF1
-406809EE7F30883E006C5D62FE0D92AF0FF209B881537F7B5A34443B9A94A6D4
-4C6749230716E53A28B429458A485D1C1530527C869EAC3DB8E0928515CA5370
-83D760905152AE563F58CD82D46F80BBD9D6CA797FC8720CBE190D7264D4C754
-4590D83891A2A01C4D43AE46AECFB938899BBFDD5A0719AB0B51BD705B33446F
-24DCFD6C9D7CEC05CBC7084CFC316B0370E9F9C5F3808822C8D29CF927C76BDC
-E6C31B044951C7F455686689CF06E8138A7B19B7CE1DFDE3343136DE9287DF1E
-81778DDC3BCEF0D6DA8DBD4D56D3E06FD6AE0B51EABDB7B52024636DDC0A2396
-D34630D3E3F47889DB84CBEFB6270B85E448E02F6E81A338AE0230551D629FF4
-94A5859462DCEBE89BA8E57E107F6AC587F79CF8B427C493A5C14AF7BB045176
-A9FEE5E34663AB3AF9A8CF714DD1DD50E18889D04110634B15674D68601C4ED3
-BC8B95B927E5B2E16880E1BC5CE1FE385A2D416973B52C1A2FE4332E964074E2
-94A69FC4946F579CCBC12BD381A80B5F2B1C662CB98138B58EBB93BCA99564B0
-98CF2EB381B04F005343633B163C4DDE8A98500B447D2BEB878AFE8982510794
-D276A4A6DF3D36B0ECF8CFE7D3ED4B364B08AF5012B5AD4BA29FF5886BDF1BB0
-72378D823C1929FB02BF7C9E41B483EE3D18817B056E8FA98FB9863D79EAB517
-54BECBF7579400AC5DF7EDE80E202AF75E66C48257A50390A9784BD6077C8FDB
-CBE3D17F8BAD802E97087A8353D3412C24B0F886AFF91D101A5833CDADF898B6
-DE548E996DAFF04D6CF8668A5CFCE8400C2737D0124A97083CC808CB80B24BD5
-0162448072D97FCD1FACC4146559DFFFA11BDDE0E2698D92A9733C10BFD23E38
-73151FA9C0D030872CFA02208A31647E1A7DD2C182044D90F90D48A9C4C422A0
-FB5A3A88331168A296EEDFAA02AEAEBFCA1A698BF8A01F109EF2FB767B4F679D
-6A39AFF1972E93364E5FC5E52CCB76B06560A8FCEFEA58BE9893F9B20ED2CDA0
-F0A2EFF2C9142A50B73A1EB3547C2B7954BFA47C590FC35260C75BA557A36AD8
-18CBBC03CC65C597F432FA0F0F27DB31EEE7F754781BFCD4EFF6570BE397BFFC
-35A7C0443A8172ED4FCB128DAA55D7A0AC14F9FFF97A43538C005ED8A1FB1760
-8D01F3440420FFFDEE149F036E278E481C35007888431CA712097362CFA27134
-36FCB600FD4C4541659571FC17B8136CF3860E2A41177C4E0B6B5E39B51ABC5D
-5B5D6D732DD3D122B956D4B4328F15252762249F5D50EE7E37FBBFCFE28B12ED
-48285FF811045768B7893A838F0E02536912157475D473DBB14CB666A00B400C
-276DB1129A8D68681CED61F7E21C5761AE13FC383F55BB6FF75579CC533AB682
-E2811BC342AD6E899EBB2B16632CCEDE09B05F9DEBD65591D8CE0B6EF0FEC4DA
-10A55429C85B679511962DB373C41EFAC813C0674DA0C2B02BFD0DC1CF82E26E
-15BD338FC3236CA8DA4FB3437442EFC077549ED51208497C6B074DFB6D386333
-C0DA4772232A367AC13665201336B291E8F08BB7B30F88A3959B21C0303EAC16
-BF5BA8B4F051B58028544D56A13B171BC76F3854974A0632E262C2B90763593C
-D85BA7A24030561D968C05E641F3A72EB769B4
+50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB600BF00E09
+8A98D1D031C430FAFDED5CFE3944C4818C6A0C98FF909FC1FA6F3E7E282BFA41
+4681DB8E2D5D12A2B653E32B01A8A9C9955AE525F963EAF4B07A6D1D08E880AC
+3D77B15077B8882DAB21B262E2EC978310BC07DB953F8C65C9D5D01F35FB5A9C
+B8C57B07209A07E1C0C1B5F1324B128B60D43C223F73DC12DE901CA5AAA63BF1
+2D47B7B0B9D35F25A459484BC917AD0D87779E379F2E5E5677F463D9D4E33B38
+99DF4ED7F1C5B33E0C23064233288FF324E07452C5DD4C46365512B412E6CF46
+DCCCB4EF51A65A8E2AC9A5BC5384F739AB8D4995143C9BD3599696884AF450A9
+0B3A707395DAD474797780AD0A87C8317DDC98871259B09B0038E5CA31E6EB6E
+8FAFD3D294971700EE6CF2D4CABAA8AE2C0965FD3E864037DBE485129CA30BCA
+3DEA01CCF4AC088FC977A4668029EDAC0CFBC69C930546E7B7EA31296D7F8B31
+0DB809DE11C0150DC81247B6259C110EF06F9B3ABC4641940EDF4CE46494AC13
+72C2933FD2B3288BD37E4055F58B0E83FF9BC369A112E9FEA4CDA525E3B92B3E
+932E64E549388DEA2C0B1F29B356A0E216B37B8742916B0AA46AFE2147532AAC
+A54DB16333B9B4B66665314F8028D1DAAA6BF0AA511DDA067041E465100A7824
+D778792F109404C1A5EFE3481C9E20007664E5664A3FFF70BE402C3BC84628F1
+2703294F2514048F2B8CA0BD9EFF679B8EBBC8E49A6909FDB6D9439E5852F7AE
+296746725B1840172ECB51B72B1F2F982740F7EE67F40D96BE2B8C310F98A980
+1116EA8A4D57850E5F87DA60D054A24BBA2831838C211B008BBF8E3683B8D407
+9A3AADB4AD7D0312D560FF2DEDDA60D0A353D797BC831E4A76A234F9AAA123D8
+1BDD68A4EFDAE4338358A616D29309A416B4962EB01F6DECB59E84A5852ACDDE
+BEFF98EAC8D864A4B457A6864A7C7ADD3EFD7B2EDB984A3D14BA84390B06B83C
+550FDEC4A8A1F60B8F47BF810BD636BA945DDA0C1ABEB31C80CC71DEA1DF420B
+D41E4D04512EA018C53422F1722EFBC78123B383C9BBACA7F62C5477BB8579B4
+471922BB21A881AB30840F1A076A3B14E7EFB5A0D04610F1D248B8D6977C7C24
+5C1307D468792CC180A2DDC3AEAAEBD1682951167D9B010A3F31F74A54114C90
+6B7E87AD0D74F6E64C225E4F6C93277084CA01C09DD7B7FA91F5D7FDF9C78C34
+9F40F5CA84E8341093AFF161914663BAD849119F4D56B5C880FBC709A99F89CC
+460183DFA77E9A8817F0488874D68F1E64F690865A6ED2FA92D4B0E08C51F5E7
+95767B6B3C433DF63FC5F8E77057C2B8194BF161C3F8104FD0FA8C4033914C21
+895DAB5D43BE63E461672613B9333FA125D04205FB9EF2708D83DF0D49483E24
+143531AE2C99F7F96F95AAE8E292E1879EBCC408CC102A32CEC3FCE958691227
+5446870CEDF38ECA235F19B62F7D83116DAE464E77EA2EF5F321EEA6E9C9B685
+27845D4BC456DC77767EE49F915496C84A7BDACF424378B835FE2CECAD2E3CEF
+366E0BEFDA94E1B4FD1D838CA676E002427508687E3535B681CD072B03356F5D
+C804A3D54746C4C7501E61176E7FCC900DD83AF1A73BBE3C3D26B3EACA9E6B30
+52430FA70C2266B17C1302659F6FD5857422D1AE32F15FC9F746B770AD6F45E1
+CCD6A402BA290917E96AE92061E801EE9876FFFF800C957D57D75EDC1199DB8D
+FAE3A98603A0964F0F05F2DECF98E798360C70AA89438452AA8CFC95C5BE6E82
+D12FF9536DB97DE9A2452013B2D95D81875820B57FB0DFDF9A4A778A914F2034
+F6A8373B81351C44D69CFDF430997BE3576D86CEE83156772E71A7A70EB0AEEE
+7621DFF6E101B32F7A2ECB0B9F02ECB4F54DCB54AAFE7978C759B116F84125D5
+401851A9360D1FDF438407FEE5843EA5E4062139D474A76121006923240EAF67
+CB93828CEC646D632F9F0EA8C20DDDAB3080BF7D774F9BBD6FDCCF38B3F560E8
+84D93B442FEA4E7EB429B7B9C14B276FCB8F39B6431A141E96A24106335B966E
+F3161D90EB9CA3DB6B3F7107D25590F7F4454D2B510A2C0B9764F80EFA8F060A
+9B078CFF276A88013D97FA5E908DE854A00FB655585B9AB0D22E9E2E86DFF0D1
+AAD10D3C1B0A34E9ED40E7B18F3AA2CB0EBE66F14A18615A0BB818A05B1B70F6
+D0DFEA076D71F8BE0978DBBFD62EC9ACABFF8703485899B12D3A68BE64B2A40D
+0D3650B42E55DCD5ED90A9CD2FE2EA64398FFE6BEC54E9BAD493D034B743A214
+5A5FD3B2AFE6FD112D73F393DD613359E7558840B0B9007483264A21F39A30E1
+239A08D90F3C11F48DEEDF8A549BAC0AB84C0CE01A39AFB47732DFBB03FB925B
+B72ADA2697186843116B540DAFC381F0BDF51FB554A7905F1FEC57CFFD19D141
+EF384F0D16F6ECFE47CD2515B9402BA6CA55D473250E3EB2DAC143823EAC583A
+BF749C1C1247CFFF1C0D41868B2CF0F6F0594D0DF2CD984757CFC86413A1FC6F
+3DB37B2CF2A2E04EBE7D05B2278EB9FABBF671ED8D8A5B1D1228C2F698240026
+8666021F7A977F2BB41CC6B1F0D3B7A46521C717285E5E61E936EC61196F820C
+C4C746560DC0F031B6797E67BAC1A518DA30EE8AB870F3A3531C781B4355DE1C
+66E31FD022BC5E8100A319F218D824FE4B0472AA8822C3F7E5F1CA5BFC2CDD93
+E1BB1B0A192842C39DB1B8703B81D1B8D8EEECD9832D321F903D7C06E724090F
+B7F4FA37064F1ED601E970091C9E99B5EA7BC06FE4E69E34052F065FB0331B07
+E3F6B76CEB7B7058EC5985AC310F9F502D982C43B144FB0A19A0EEB0E8D2D59C
+FC88340EEA8CF2EC23822956934954194DA3850C70B135FE2626D0B75C4CCB35
+132378CC7BEC8DD4F86A9B0B1D6C3A89BCA2C750DB5FDFED7BFA2C0A447C614D
+812FDD4000CC37A0CE6994E0C35871C426F872395C71B4566553D083CC436108
+7F50426FE26A03EB7877250BDCF09861DA35E0E92C34A6714244CC183FFE6F82
+C665A6408136EF31A0A50AB9C38AB284FCE23F867D12FF239654D18DB9100A85
+1FAAD02EC6F5B4AB691916A846CE953CAF5B32774D37E208DF38BC9EF3A5F680
+A62CDF924DDA39563128E7FE539FA6C2CE09F5C9F154BD523D3B1211EE7C5437
+128C316A8F171E3B75E27B204531BE59BD50374BF918DFBED45D73FB0E242B6E
+EFA52C5B0DB85952E4E6C86B301A5174920BD322C49DBB29EA44646676A4C4DE
+EBC9B61A279A3CEEDA2553D4B2136294074141687DB75364DD78E6815E9AE2EC
+366FF3E042726B039A9C5C193B53C808CBB0A498B7C80404754B67F7CF49145A
+D1B7E337076982EE64E6F76D31BF17C396A115A69E0610F25BB9E5DEAF5FECE0
+8319CFEC44B8549229993901FC72AA17351A442568754A3B5B4DF7B8061D73C6
+0B29DCEAC0DF72A6236D4BB6ECCF4EABC47713B2A609DC07D96740A769473869
+FD1AC9B5BC0137EB2A3327B51378159AFDB5BBF257F4E60F127828E8CFE74E01
+D968038F659EEBA34361CE6CE0987A80C7ADBC06D71C6E3D815989AD77551771
+66F1A1AAF42A3F7649DC718AB600BFC70E4CF0247AA2A4BFBD84771199AF150B
+78100CA83704D34EF7D65F51235DAD8A5882EEA58729CEF60CAD3683B572D0A7
+89A6DAF840DCB6C7AA4A4B23222D08087B975BB64809926B588A0300F0DE79BB
+320494CED7BDE6636F3D9D826D7353C2C923BFE00949B710611D9E3DE47C3876
+711F0135334980FBE4801C3BFF158F1FB5E2E5E388D8EC7689E92D8869A7C166
+1C4262C63687BC092675C23B6755BF2B107647A4EDCDBAE8E511A64ACEB9CDAD
+F15ACE64F8E8E4A9B2064C0FD8E446CAF1592C8F109376B98D4A5B31B15B2892
+7C0FBA025E497B454B25DA16D9C31F8C0BD17368499D3B1D92A06E5E4C8C6A87
+06E7E68C95975157BAE3712904797B50802CE069B74208F549710D978CE4A253
+C186EC2D6415479D0FEAA1DC076885B2A509B0E6411E6B5C8E0EAD7578997B9E
+C5DFA526E73CFA5D3839664B3470B1973FE1790EFE2A534A277AFE1B140E5669
+407396D0BEDEAD0A9B7B7AD54CAED5C8A70EEF86FB0045EEB34907E32204EC9B
+278C809150B70F1F086F756AFFECE6F05946C36C265EC6EE79F9A8659FF0549E
+33E4E750B3292799B3448560930996F9FCAF0B5083EE6F23B238A41EEB065506
+B63F6B94F6DE9EDD11947AFB257961EE4297C832AF97D38AEF181FED09CE97D7
+FDCC50CA3BA7332EE65E16B91F62CD678C28CD26B87DA984AE10BE0276366AC7
+7BE023637C1122C8ED16412B00637D59ECB9ED3DE6A6A816E54630DAD0E5E306
+1FC9A8070EA0EE84F2E59A7E4D814C8F766ECD9EA08A23E266F1BA97362D724A
+CB2AF5932D160D281A03342E28D57B55042D68827C831B8BAEB3A42E3A38531E
+36FC41EA30DAB3F1EC598A3E011099E5586F65C806A85629AF34351B3A24A8C2
+76E43F08449043C788C5CBA1B0EA703C100377540870DC8CB1898D6783B29D66
+23BE3D60C08251392D5060FEA9BE4A40EF55FCDF1CA4BEB397041CE284527907
+E6969695E657A1A75665CB7EA8CEAB74972919F286EF710A7D123E81F60F625B
+8BE0EECE4F52E73D0186ACD058D96721819B43AD03C98123A5892B4198E3304E
+1925512299560CCBA0AEF6F9FA2EEDD0ABB0D0649AEF7DA23DFF6EEFA2BF847D
+99A217F8665916CCE5518D0849D611C7221BDBDDC4FC0E7381A49DA520815274
+3934A0FB9435C721CAB181701E292D3368DFFC86613F755D4801E97D7B872E0A
+0F6E57A80363EF1DF156CD873C303A898A5D75D742E755D019DA3091B788A036
+0CAE670793C4CAC7A15C2DEE25E49D7697F17D2F4715C2DF7964F2F88C13D83D
+C06E6ABCBF412C543BE52A4166FCC090F12E66727FF1B01C8FDC772E52DDED00
+40EE0A60818F186487150B1E5EA3B73196834A2D201E6847E3EE97BDB9CE9B6B
+ECD33FB11216C18EC4E2CB7C4B8E841EDC37057FAB5AAF23A088C7DB0CA3DB9A
+67799B2629CE0E70610F254A87A925D3D107450F209F26481B5F416D41E26C55
+934226FAF151ED9FD52E19841CC57B3C45A5F9F15B6FA9C0CF8827EC69D372E9
+839B245139330A92B0F8F2E759D0F5E2AEE7A08F0744DAE19CA53080B062D3A7
+E1A07511FF4803F76AB6E51A80185E8734392059F3B1B9ABEAEFCCA68FBE923E
+3CFFF31A62C16BB5596DBEED2FA5F9AED96A0A42A8EC600847A1D80E24F63BCA
+D6E711FF7F0A96C1F87A8D70611B311F87A04535E4822A7FF4531A9B1FAAD13C
+4E80F5AF473AB4183C65CD87F6D9FF0E5FF6279E3E174314F3413EB629DFC3D4
+DA5B751031BB211DFE829F583DFCFAB20C9D972BD57B2C3B604141AAD99A922C
+38CD696CD05FCEB4035334B02A1FDEBAEBCE1672ED6BB7F83B5FECE3001B9F7D
+70B45AE7E282D9F9FBFA62187E7E0675969C232B581CBF4C6BBF10C5CE84C3D9
+1ADEC8110EA8566DDDCD81E0C00FC5D59BBAFFEE83C274277CB42BFF09D2AA05
+FA0D8BE8DB1EBF587D31A5A8E9C570302965B2F148833CC8C64FAED2FE6DD962
+4FDF21B46A8A9C9C54B873D6DD285C1FC20BCAA83AC67D7CEB023F29F00B1438
+3BCCF291746D6A04E176368398862D4394BDB6BAB8A24BFF5DE8848D5E250E10
+98CBEFC7D88AA7FE731F6B398BA1BCE100C3C3F602C11CC039FE279B7E46DE37
+0C8328B49107C6FBAA10E509A76C9A7D34A8B96418A36EC0B3F56348A1CB5763
+2314FBB223B0CB9C054730EB2D8F9BE48CB980024B624A3FD4794B22F18ADC84
+20DA169DFCE96CAC361942A22FCD95E260F46D1279F293F2709302539214D2DF
+70D1DF28377F0A99840226330506FB5EE3A0BD9BB02A99D840A3EA58C69B93E0
+50E7B164165A7EDDFD0E7A4083891E3F5A12653FA9AB3BF1C330678358A50910
+C65FE974EF46C8AC66CF7E16D27CC6CD372FDF2E7451BF5753B029E8A456FA07
+3207EF3EB547B319EEF01DEBC64DBC8A33FF83DB4ACBA00502EAD9B3D7CB8501
+5942A7617ACAFA1594657513F71FABD0BE842A5DC60D629D0C752D7632F7F047
+0E7C87CBF771837B5947273AE5DBD500A41B884E576488836F6A8612F93E71C5
+4D64831C34B6FAF3DECE28BF4B20E7A870AD5D0F15670E7886F43360C0BDF2E8
+5A55496CD838E57BD4A0C27610AB2F5F0A7D76C1AA97641260FA03B461A3D223
+3DE435A15CFD585F5BC82BDEABF1977D7AAF973C6207C632C2DC5EA4D6617101
+43F45CA50D60132309E8795D2B0B6927A0C06324307C6599521A9FFA4CB5113D
+7C23F8830BC9EBDBF923AC5B12BB34DE6E1C7C0129D2CF2EAA09B68DFF712912
+A46E032A2A575B214293E06ACB5DDCEEE77C39F3A9071D9CE655038DB4EC2A2C
+480AAC659FD3D18BD497A8F6C5446E2A6496AE279803F329CBB3F6923C53F965
+7B6801DE0D3B1E00A8F5BD2FF70782D962F31AE5C6D6DD32F9307A97CF121830
+157802BA4A56043F833402A7A383B94D79C80ED4FBB6CF188BB91E421165DE85
+245E64BAAB30690EB6C3A8E51F6C074BA0509AE82F59E74C7417D06C65202030
+D602637542CA33CFA6522119EC9E2F25814BB5A196E47146ECCFBC844D17A5AC
+18C1F640E28750D3B6856A38B14FBF3B3C70D4BA559B2DFFA01D112CD89F7F40
+A201D0DEADDA581EF4AC73A051C005BED84C7AE69C3AE65163E8FE89F50594C2
+67747A3724E89CC50075956D3F2BFFA490FB6C02CE988AD18F52C815F2BFC18A
+D1A86E95576C1076F955183310B6271FC489052140553A08F9E322C0003964FA
+5751F67640750AE533F7D90061AB9E487C4200A30AC0CB9D1D6B882631125FCB
+FA1B24573E504A042B2722CBB83D5701294600EBEE5AD470D1983D44124FCEA5
+51BEA2690F79C58BB913A8F6036B7FC87C5314B6960F52F2579337DDADEE0249
+B2207B7AE69D4AAD19E5CF36BA318FFA19324978B4DE4ECA1E66366B070175C9
+60529A88B19F69587F9F479EA8279312DE2F6302FA872DE1A623654D2C46938E
+4F92B56E3C1513F80425060B66928CEB8672DE30C722631FB26EDCD7883F914C
+4F07167152A21B6D4F7AA789841648EC8A6859EF4696F8E2A615ABBE54161E8D
+C79111FCF9F9C956C1DFA1B3462C3C4570C91D3720812182CA75C72CD4B1979F
+D6376F48212F466945C83A94F148F300A4FF573334D01AF0E6E37E4D8F918A02
+9CD4246AB83D1946D230FF9BE714BA3D5BEDD2D331C7FA68CFE88FC0AF6F89B5
+E515227F55EC66293FBB3FCDD1976B0DE8ED0766F8F60E44B7831E25672BF65D
+6DBD52D97FBE605A2CBC2E4B72C443D2F60658E81E2183BD70D4E66277560B0C
+DC0CAC9F41726329AE7208C956D246B45CD31AA4152D23468902E5903170F10D
+BB169BE014910AA9102F382BC033A26B4DE9DAC0D7ED7F848C9C9176805D4B5E
+8D47176190D1F7AA6F8B1B2F77A5358C3B44C21C3A4F48359DCBDE38F636929B
+F0D6140AD48F557516C88E2186B12D011573A188A71771F37E9FEFEB9781137A
+1F44F2C90F4204C3B018E015CE87976E38F65505E54DE894A2E9B292BF742ABD
+35521DBA016B6A3C1BE594C020B1254459D3334F92BCF2645A454A3AA0F9A40A
+682C816937D4CD2C392D396E6E14DC64CB72143F9C3925CED4A721ECA16F39C3
+06A04605C768344C64FA9C9B75EB4FDD28139BF786619544F0A077BC564FB554
+A59DAE6BC2058064C0106C4878418D6A124654B23D9354706AF7449C996199F8
+1D3DAA2A712A18CC214BECE73751E996933968EA5766801653EBC042D1B38AE2
+996900B303A56EC81141741E26F4310265D8E785B1BFACF7B6210F2AADCE5C84
+56474ED40D92666DEDC745E4521DBC1A26F26AD1319DE992822838EA3FAC3C02
+E4F185497747635D932FFBB6EEC172AA9B975042F665BD097556EA18AD19FF77
+CCF11C505E618A19BD21159748FCC9005C9F6BEFD4B3840307B11477F21B4C80
+C6CFA2E822731A4372613498B69886FA4F43E2423C73928395C85CA14C3D5EE0
+41A6FED4A65533409372897FFC229C88847204EA16770DC57FFDCB88FA7C69EF
+EBE08C4EB56DC0D1561023AE4F4057C138FFFACD7E0B7E4C3059B168492FCEAF
+39218326F9C53CB151479639A0AB8CD5B7EAC4F53C9D54C2B91C2D6B42124C40
+C6F69ACD9B93A1AD62F37D68A35E59EF96A332ABE5CD1B52F8BE81C98EBB5C6D
+611D98B24386832ACFDB35AFBC089181D91814CE1098799B6453E7DCD921BAE9
+92760955D4729353B1B9316BFFFF1F9395BB293244D1F2B05D5934830084A81F
+C723CBC710F0CAFB8E79D6376D874DB0DE06022FD1E9916FD034382C24D35B57
+A93B81C632F39ED08B37CBD0026D727AE8068912566BB5474F58EAA977B02B87
+3162B42EED393667CB88AB5AD10EDE4A40D5AF10955DD0CB0C99FAE88AD6FDE6
+56F222885FB42190FF4882D51DBEDFED76DAB1F9404C4723B6D7727238E1C18F
+9E607AF6948E851569349ABCC415FDE3DC33F3BFCB410FC8B9773349491AC74F
+247BA3B60D1E6183F8A666AF584453037EAD347C6C6AC7D8B0124F398AC6A323
+FCCC15CE4345B56BC2CFBBD17AC5353D60191D0E3C9A9CF78DCCD46DF5F94C08
+A012B7618901095688C82869D11824493806CCD4FD7F90A3347586E6681D260C
+168869AF2A9D1F16637484D4C81382EE66B08BFFDFC57EC9FF815B1B8F60566B
+A405CB9BF6EDA6C9030FBE770F82DDBE998CC1A21BFF7BE67CFD55FD0EF86249
+EEE248A9CD8DE1CFB4CB8B100D29E8A2E50324F7D716A6AC7745BC307E74261D
+9AC05E3A9BB4E1EA6D434C82DCC2675CCE0AB1AFABCE03F8A938321257A15ED9
+71FFCE05DC19AB211D1907BB9DC032004EC6AD80AE7342DA9EAD9B6EA8AF4DD6
+E022B3DA7D187B42BE8D6F0682FD89F4283AC87D1CF68B6193A500539C7E0280
+DAFDD1A43E0560D2FC444BB9A949FA408F7F7E130E5D1656F2355FA7264B57B8
+40A70366CB14DEF5908C1A69B8365DC0CBBADFB4B82B2FE6EB68DDC9B1FE71C6
+2D61F5A48DBDF1BC8A9FE9D81CAE0F95A2FA190FC194A94623826D4A76D24132
+3A3A453D71E03414205A14ADD34DE6654972FCEC6E77BC7F988DF7212D642FC2
+86D98BA69B2CA28426880D25B97B845D3B0BE5015029F37BE17AA11D4A457118
+08F97B141DEBBA2F4EFE542CDC3AFA825338ABF0CB919718DE8C3ED384AC8078
+10BB680A52115C92AC3A6C75CF5D9BE57277BE62A0C638D058B6FB4F22B669DC
+9BC239891E3006D13D2B74A8878B8D932F12E4CCA70E5DBA1CAB0EF0D7EBA6F9
+8C89FE5A4DE66FD55579EA6E0D0B302AD7FAC851FF41E1B50BF2771D45BD4287
+A3712CE3E26C1634C30DC6E0C2B2B9BEFED266A65DA87505B05725D9E882496A
+3A2D9BCA03344153528C694F151250CF45ED116291453BD9C364372F19E3E047
+3B2E1268377C5F3D60376892D49EC914156AC19102AE4B83FA1BCA49B20596EE
+73A6B8832F30BC5440C076A5C79E61204D8DB5C99D885955723016C7E93218D3
+3F1DE9F004F301E134966BC7B30D87DCCE1EA53863D0C4231E6FEBA239CBE110
+D00DF9F318F77B6A55BABECB54FBA883110D88F2EAA5837954B88278801F1FF9
+DF37E6642449A7296A34CE8D14B32970C37A013A83D60F9D5F3CCE70E80E3AB1
+24DB2F9982D9A1281B7792BDF5EAC3473422DBBE5492784BF5B0DEFBC6FE05BA
+283506E84F5DB90E5D31A94CB84FC593B9A12B2F48DCBE4F0567CC6ADDDBB8B4
+359C3EF63045D4A4B607DA8CEA2EF305D9AFA2EA059C061E8D877E10F2517910
+2EF8EE46DD88AAB0CD1366B226D48FAB68294269E30D032A859B1BBEDB38D679
+4C545E8D4F32E78764B36AE45E2DB298ADE78DD1661D73BBC892EEB03D3417A3
+39F4DB9D20F260885EE5D6900CCD091152DD0DDAB60EC66CEAB06E4CF987F90C
+1D4E74BF853A04C2B74601E743F52F0F29D2D05FFA0B6BACC64468CF62C0A2
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -2165,8 +2170,8 @@ TeXDict begin 55387786 39139632 1000 600 600 (pt-br-refcard.dvi)
 33 36 51[26 45[{}19 66.4176 /CMTI8 rf /Fc 242[61 13[{}1
 49.8132 /CMSY6 rf /Fd 134[32 1[43 32 34 24 24 24 1[34
 30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 11[45 1[34
-2[41 1[45 54 3[22 1[47 39 41 1[43 42 45 10[30 30 1[30
-30 30 30 1[18 21 18 44[{}43 49.8132 /CMR6 rf /Fe 129[41
+2[41 1[45 54 3[22 1[47 39 41 1[43 42 45 9[30 30 30 1[30
+30 30 30 1[18 21 18 44[{}44 49.8132 /CMR6 rf /Fe 129[41
 5[43 1[43 45 32 32 34 1[45 41 45 68 23 2[23 45 41 25
 37 45 36 45 40 72[36 4[41 2[23 3[45 47 11[{}26 66.4176
 /CMBX8 rf /Ff 130[35 35 35 35 35 35 35 35 35 35 35 35
@@ -2248,7 +2253,7 @@ b Ff(C-g)-450 3864 y Fh(Use)28 b Ff(C-s)g Fh(ou)h Ff(C-r)f
 Fh(no)n(v)l(amen)n(te)i(para)f(rep)r(etir)e(a)h(busca.)45
 b Ff(C-g)29 b Fh(cancela)-450 3934 y(ap)r(enas)c(o)e(que)i(ainda)f(n~)
 -35 b(ao)24 b(foi)f(feito.)-358 4131 y Fd(c)-375 4133
-y Fc(\015)e Fd(2006)h(F)-5 b(ree)22 b(Soft)n(w)n(are)g(F)-5
+y Fc(\015)e Fd(2007)h(F)-5 b(ree)22 b(Soft)n(w)n(are)g(F)-5
 b(oundation,)20 b(Inc.)27 b(P)n(ermissions)21 b(on)g(bac)n(k.)28
 b(v2.3)1860 -364 y Fg(Mo)m(vimen)m(ta\030)-51 b(c)o(~)-56
 b(ao)1860 -208 y Fe(a)n(v)-5 b(an\030)-36 b(car)1124
@@ -2553,7 +2558,7 @@ b(c~)c(ao)28 b Ff(interactive)h Fh(explica)e(como)f(ler)g(in)n(terativ)
 l(amen)n(te)4170 3286 y(argumen)n(tos.)32 b(T)-6 b(ecle)25
 b Ff(C-h)36 b(f)f(interactive)27 b Fh(para)d(mais)f(detalhes.)4463
 3550 y Fd(Cop)n(yrigh)n(t)4766 3548 y(c)4749 3550 y Fc(\015)e
-Fd(2006)h(F)-5 b(ree)22 b(Soft)n(w)n(are)h(F)-5 b(oundation,)20
+Fd(2007)h(F)-5 b(ree)22 b(Soft)n(w)n(are)h(F)-5 b(oundation,)20
 b(Inc.)4627 3606 y(v2.3)i(for)f(GNU)f(Emacs)h(v)n(ersion)h(22,)f(2006)
 4760 3661 y(designed)f(b)n(y)h(Stephen)f(Gildea)4170
 3746 y(P)n(ermission)28 b(is)f(gran)n(ted)i(to)f(mak)n(e)h(and)e
diff --git a/etc/pt-br-refcard.tex b/etc/pt-br-refcard.tex
index 900855911d7..945fce4e47a 100644
--- a/etc/pt-br-refcard.tex
+++ b/etc/pt-br-refcard.tex
@@ -15,7 +15,7 @@
 
 % Nothing else needs to be changed below this line.
 % Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2006 Free Software Foundation, Inc.
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -69,7 +69,9 @@
 
 
 \def\versionnumber{2.3}
-\def\year{2006}
+\def\versionyear{2006}          % latest update
+\def\versionemacs{22}
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -78,7 +80,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 22, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -277,7 +279,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 \title{GNU Emacs: Cart\~ao de Refer\^encia}
-\centerline{(para vers\~ao 22)}
+\centerline{(para vers\~ao \versionemacs)}
 
 \section{Iniciando o Emacs}
 
@@ -485,7 +487,7 @@ utilizado.  Tecle \kbd{F10} para ativar o menu.
 
 \newcolumn
 \title{GNU Emacs: Cart\~ao de Refer\^encia}
-\centerline{(para vers\~ao 22)}
+\centerline{(para vers\~ao \versionemacs)}
 
 \section{Buffers}
 
diff --git a/etc/refcard.ps b/etc/refcard.ps
index 21ac140d44b..7e79f255048 100644
--- a/etc/refcard.ps
+++ b/etc/refcard.ps
@@ -11,7 +11,7 @@
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips -t landscape refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2006.09.26:2327
+%DVIPSSource:  TeX output 2007.01.20:1513
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -418,6 +418,7 @@ dup 50 /two put
 dup 51 /three put
 dup 53 /five put
 dup 54 /six put
+dup 55 /seven put
 dup 65 /A put
 dup 66 /B put
 dup 67 /C put
@@ -480,221 +481,225 @@ B0DAA1BA19D638676E9CF159AC7325EF17B9F74E082BEF75E10A31C7011C0FFA
 99B797CE549B5C45238DD0FADD6B99D233AC69282DF0D91EA2DBD08CE0083904
 A6D968D5AE3BD159D01BDFF42D16111BC0A517C66B43972080D9DD4F3B9AE7FB
 11B035CE715C1218B2D779761D8D7E9DEBE277531BD58F313EBD27E33BEF9DC5
-50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB600A22D03B
-86A088CED7AE528182D2EBF4D351FD835B5DAB2036F44604002D0E21510DDCEA
-F8DD36174C2CFEBAE2D183407AAC7D4D52D51D5B2890CD3B23A88228089D26BD
-6E7ED4B31A60C45C7D8C00274A812ECF682228F241C13C41497BEAE1DB58C3B8
-3EED1B4F48D1A4706D71EB098C4FD67CC7890957724C12067CA54A2140855928
-E6197231734CB46E3EF820A1C19A6AE55A2547EDAA9994B59311C2D02BAF4950
-2A8739E2E60A1490884101F56392D67FBCB271783118B2568E2DD484465B899A
-8312F466470B4A490266852CA56F7F56991A746CCD5A365EAFD700D47D11860E
-2E2B21C90AA8B3F9915F81F0E2C2DF98D942F3CEA2300F2B9F6BC99FE21F2966
-AA932F222C35EECC2520F10C110D6FF9A32EF56A812D3760B54B451C79D6FE5F
-3F93D3E5F9E4D56096A92B9E953F160551BB6FE26206D6A317219222AA58FE76
-6C758416537175D1F7DDA512DAE5A4794216C90B561F6C29C44FAAA5EB719F20
-43333A0605C0A095D8AAC862DE53BFE3EA97A756193E9E74E7604AB5EEFC1E7C
-00888CF0F286073143ABD034A1BD66E81E588FF34930DA0421D01B48A71EF115
-BD68ECA6C15DB673CF17821A79484DA091B0FD42820B35ACBCC4E2873C3B4950
-F76EFCE8F0A80EAE5086450D76847F299FFEFAFB731C72B63DE42CDB342B1691
-0CAF1AD419B1B3102894D78C3ADE69C39ACD063566B0118C0E127D4A7C013D93
-C3F3A8D55B3A6BCFA37FC6796CB40EA156958F27435A2832A5FE55A08B76E258
-9440C4741B30E211BD4216DF1EDEE02D168A398B6769F8D165B7D7225D278BA8
-994DDDE391F57EB890156023E6E3D56E22843F3DCC582F7E6C571EF2BB436631
-A7E7738ADDAE7A0433C43A8A3B90AD8952E976F348973F79797E5B68469542DE
-D610798FAFF13B24AFA2574BF898DBD661417C41BD0FB6D448CE99BFABB91117
-E8CDCADFAD71D882E51DF28B7D04624615C826CBFA745CD903E2303337AAA886
-DF481C65C7D914DE22A026BA75D232481DC320B89A9A2F6DA1D9E54C48CDCDF3
-F657A66DFEEA1FEB0E98A71666F115BAC1286D5E0273BE8A67ECEDAA1BFA4921
-E96E67138F28919D708719107D48D8F0C4E4DDBDFE6DEC21C27F260DF7A46327
-D924F8918E2F0837760BEC3666C7D5D60A9F2A7EB0DFAECA1AE4A79C15CEBDA9
-7592B665DFC923D1C6ECB7A3444016A1F9760493BA1D71232BF2576DB84CF966
-7A7466A55FDF764D4BD7810541055B989E8A8189ACA63014CF403E3926C4F455
-81E25361FE1339777B597EFF1CD63F007EE735B9049315DE035415170248B359
-EF4A0BD6960E23D3318A59E11190AFF749ECEBC81B0D3E26795B6369309ABA76
-C1E2EA4EC1DB3065E4618BFDE7729263920EFE5236EA355BC30C95C62718EDDC
-69C3824B6A450B37974FE23553D0E1ECA572155E53DFCAD1E4F7C40FCCEB42F0
-8A41A4F516B5937D75FBB86BF290BB6548FF327853DC5A25D002A381A13DBAE8
-6CFD76979CBD26A4F4D97A791BC1E65AC1B34F43AA12D9F5E66E85E368AC33DA
-2626EE4E399623D6449037D555E35E0A22E4AABC91B360D7A961FD335E37FAD1
-46DB866561D431B05A65BE91077FEBAD52EA5587D5DB86CBD753EB270B4AFDA6
-68C0F1232BDBC07B5D7E2B58AD4FCE8D004149EA212653A83BCA85A1BC8E5AD7
-D15D165521AB6377FA20A09413403C79B1266F49D983AD0BC50AB766F1CEC782
-4609F22694540DBCF5FD113626C89BDCAA59F4905D07BABD08BA49F976C0A79F
-94A77AD26783AA9BC47B8A11CAA11090D09A88BA948844A45BCEDD3CDE0EF114
-2E16ABAC0D90E7B7345C04B53577218009E67C7B7010AD8DB0FF1073DE31C770
-670C6619622031490EA2A2D1A9FB80DD21A5ACC526C2BF0D999651B8E22A28FD
-47B4708B288F5BED8E5DFBE57FB3FB33F00657B8544CDF6CAFE1A3BBDA9F2296
-3C5BEC4351412CCB9AB6F450188D307B9AC70CA7D9DD184414833868B27BCF62
-C8CDDF23A7D796D0A1F8155E66EC9D7B35BF0FBE185103A37EC12981EADBD16D
-70CDB2D685FC168F08AE39F375739ADFC915A63C6A7246D164A12569155B956D
-A7A5795A6EA9D4FDB0AFE54C63CBC01D5C338B68DAC3D23B110527B91BC0527A
-30D7E8B7DB2A6CA19B7C71D78D71C41AE0557E0A9CF2F3285F53CEF69DC3C91A
-B3EE632FC1416B4B36CD2FDB8BAE850FAC5E9E0B7B57534A8D86948074AB123B
-B39EBA873F819AA42D36D4E07E2507EDBB3144337A743FB436545938E4DEABF7
-03EF9E9752B4DF79396023282325AC3AD52F42430A97C54287C94C3C910D025E
-B6C40DC9A11D864614393CE973DE186B99F4B3C0F33CA18E1D30F8E8EA70223A
-36853FEC29C0F96B59A6F59C0A33712B7053001FD554D23D0FF848FEB3C7EC9F
-7455645E42209FD5B8CC08A4A882E34275F6EEC5B16E7A7DE6C9D8941EB6BB46
-ABA35AA067E0439AFFF7DF7A660D66C8503BF35EC83C32270E04512FFA90618F
-6825695BB8ED9F97C4FA706BB84B66A9BB210628EBE19ADB36D679CF9E7B3BFA
-4D4764BBB31682A14FD537266E2CE1F4640131D324382542FF8B8CD9BB108B69
-6655FE8FCFB277A88C58A7E2AFAC9B740D840EDF1DFC50747CD3EA1DC24B050F
-B12404954E42E14DB6092B38F32CBAB9546A9784BFF7FB16FC0F3D2875A35A16
-75EEEA82FDD3DE0BAFF2C26BD37D229CA06A002529D27EAB41E20818ADFBBB5F
-0AAA37BB95CAD96A3F700C2E5B7DD988E89049051077CBDC2DDA592E2B99C090
-53C7D459D85A72B01880F10F9919777AAC2A3133B8A7CC5926ACB6C87B0552BE
-D310D8E86E5F4B142850D45664F2CB087C0E7546DA66214DE18E67D1BF098A30
-137068F9E9735933B96B4242E805B0D4E58FC9EDE7330D4217C9315BF6317608
-ECEE1BFED5BE0CBCDBE36119465AF20A6D7A3244652112A1E602C358D5271595
-213FC19C6562678CA6B38A817C0E7CD65FE588A1D9307FACB838C6F5461C0ED0
-888437043743899769E94B7EFD49B022E3A663EB0A00479B5C291937407B52DB
-36E71F524C1C6F4A91BB99E1A824A25C3917DDD42FC2F9DF16BB14C4D28CFFA3
-BBA2BD381C27AD1885F7DECA566B15C763B3B4B3F3EAF3806275D8600FBE4B42
-D1FEBC74147DB1CF64549C9C7DBEED10F44F4D585371BBA5357ACE0BF864231A
-436FEC2C90C94ED01324D5946B89CC05C087CEB96AF03E350BDF44683BDD566F
-0B2C48C4041411EF91A57119C9ADB0F2523477F46F72FEA57ADBB2AC25D3135F
-4F0BD460DC6D8E29830341C64BAB91275E9CA08B713955A5D344EDAEF871DCC1
-B50F30858C3C3666597B73A752E93DF128546D1A1812C5B916AE1F44CB36DBC5
-A26B5C3ECFE3A3E2A013B5BAD5722A8943BD678F651528ED340EBBF59FE47E0F
-D7BC565E44C38FF7697C3F1569C241D339EBC685E7C4D7BBD318B74E6AAFC97C
-49EECA3B147E485F1F2475AE983A18395063BFDE981F51E6A2CDBF1906E499CE
-6C6403DBD85E65E44839011D7E3F62B7504A9CFBF6A5D3C9AFD6BA64E636D7AA
-E43BD83ED14C6EFB36A5233A5D795622583AFAA09000C8557848705231B6ED8E
-5E3FA79173C172763C70AD176F4F3DB0054F144F661F9F028B596107DDA43168
-11B6A56CE4D375EB9F3DACC6EC06F632CAD1D994217FA7DA1C56F681FE7CD0AC
-6CA60BCD21FF4950D20D4A3F11E0662BC1D3CBD8AFE2DFF3DA1C609E0B337B88
-87B6FC6E735DDEFC00C491916F69D0478BA2C346608AECD337AA80031A269380
-45E450ED7BEAADFCBED412595BAC771ED3C1BFA4459A6278EA1F00CF89C9EBDB
-0A43F9CDF70A0AF808CB329CE9907FD5B36C3AF5D1C475AC99A6D6F22596CD42
-1CB7B14123D38D8FD9109438D9F49EC8AF29176204C0A776C60009AA148697B7
-F5496C6FA123F9ADAC59400E139A0B886E110425839B747241A0FD2DCA8621E4
-AC3B71FFB6FF1BD4FC5DF726DA5F383D573640774EC6327F772290930F2656C3
-3D3B1FD3F6B321E0919720F03F3C6EC09D05629549549CAF621EF916071CB6F1
-22625657C27985471E16B21714100F8B80A2C4035C5905C54FF95AB7358117C0
-DE70C0FDA8187FA316189D13A9176C1171A318A81D6A77F0E54D6DE37E5D81C2
-5BF1C7EFFEB8D130DDEA4250C4FF4F1BD1B535A20C3FEF972323F114A9FE90D8
-48162CD532AA3423FDA9AB00AD6754C8216253CE936DAD6AED5BAFAA64921186
-E217F709A73D6083A8D04F11FFF49D2D8AD5A55415043A8EFB32A478B9D70F95
-D9E63A92B53EFAABD9BE62461FEAA541F5CA67FC137E3AAEECB5BE50FF74DAB4
-18BAAE0A7244F072B33F3AF7474EBC681DDB09F4A11663EDA56268CEE9E653D7
-4C068E233BD3F142653DCAEB01E2825AFD6ACC54659F66B21AEE64F66727F033
-B3D7D17C051B17B4BF41DAC5D8FCAB88A36DEB62BCB5D248854EEB8A9EB2672A
-391013A66539BDAAD4189563B45C2FB57EBB9B02BA6845FE2E7D66CED6098014
-2831ED864C366FD3D2A36D9823E84C686D401BF9F01B71CB9864AE245E34D554
-4DE79FEE3B5C74846967D0512CC9FC103DCA3DF48D0D491E70C8A102AB9A92AD
-E868509AEC8134C6587B505139FC438FA994819CD17F108C754DF744F31B0731
-E07BB4F12389EA058127E75F5AC024595CD8477F5FEC80AE9EF2109D0FF15326
-808FC436888B98938234E93EBFB0BB009F8FACC9D0BC0058E37040CED69EDA45
-D08942E834665C0595737BD2C4B18CEF53BE576C03427D0EBD25D335ACCB2473
-63B2FC3FF036BEF8DE2CAA9308E089C591C331DE41017E36914FBC5426358701
-151572CE393FABA2C55D67E7CDC90C78CC6D58C3C6DF6524E5A9804D0D9A0E3B
-DE85F7D0057D2ADBB04FC0077E0080DB404726A8AF5029FAFC05589D835F9ABF
-ABAB4C3B3F66384368D4A2B6B3D6C1EC0FB4121C59D1C5C50CE8E65E988D06AD
-7D03BDC5B095F3BB54A1E4E7DE57601A28BDF6D1C8A26268FE2A8B510CC62B10
-A2F69EF9E8A766BE982C9D791B42C10502F3BE4516D103DE941633F021DDC99E
-4C6BB01CAFD7B886E677897C775485878943292F8592C4DED879058D96EF9F10
-B89C8BFB5567EB7D53B13F1C9893A60D22246DE121C993E9EA563EF972E433BD
-DA1119607CEC7C89145164BBF82194A31932BFA6EA40A2466EF148E9EF09209B
-973714C0DADAD79BC4DC8F767D948AA227F9A12F46262ADC3FC80BD464EB3750
-51CDE98239A728AFBA32DFCDF0E04F1364399121FBA23EA9660E71F1BD2BF976
-F6DB04FE31B3D89112C8EACEC00D8BC0834D63025580AA2A77588FEF5F95BE78
-7AB5A9BBD218B94A7D7E14AE6FC65A615D39058DE4644A126ED9AA1EA03B0A90
-9B8162D84A883D5BA85B83BE8E7EE7B3EFB9F50ACFBFDE4178C4D12D6054A046
-7CC57C142E055B9B822422C9F6E3F2323278AD2299BF211302CAD720BD980980
-4D4EBA8BCE79BC6613EB227A233BF4E0C5B73FD1C424689FECC8949C19E581B5
-9B4534060BB017C315E46E102F9C54830C11CF867846427AFF0293B6EF11970F
-A5E75BB89A8937512FAE083F1BA63BECF2B5ADCF9618F092F461096C565B55B8
-714F9AEAB4F76920A80BB74538CAE55A617C3B265F64E1B1EB19D96DEE120581
-7FDB28B9823C6F5241ED566AA02650CEEA40E6E1A2C6DB55590C5B5572D8F57B
-6AEB288D7869B6A7A50B27E496905CE770852E9BE460CD2D1C723FC7236F92DD
-727B27FAF82E9E7F32BADB7911ED3C6525D913BFA333EBDC18573F1441624892
-EB53FDBB6A945B38FC9C376C3D534127720420E20DF513EF381E2B6B5D5E5C23
-83412BD67435CD6BCE407B8FDFCE4F0A0C35E5DF9DDBB2D1D5D7CB2A45D886DD
-58F908A07FC48C245DC31F28D30FFAD477A1D1AC593FFE8086D05B285C700996
-2CB06125A817D4850B6D3DD246D671554AC1F513932BFACF92A15B75F87DB140
-F5225D5B066A913E6E3631F160CF60F54709FA0DECEBF1BB203F4D902B4351EA
-6369E4872617A98DDA8BFD29E8933D201A09149077EC934C0B082B92244DBBA5
-0E70943FE5E1E8823E0620C857D8A3CE3F857FA05A0DE16D7673E9CF27C847A7
-C8A8DC1F7B8E80A652C47C0AD748A60D76724354AE6D98D37E164B8DF1AA36C3
-04975386BD0C356DE67AF3AF9A2A7C5AB957994A588CD1BF864C64C2D00F8D07
-CCD30A5BEED0371BD23A4622BA3B8EFC35FF8A552E770FB899BFDD7A924F228B
-95B56FDDF795C0D469B399FD0DDC140CDCB61C6A6E30561CA594D7A7A0E86CE6
-B8B4A04D3651CEAF4D11F86CC71A66DA5D66555E27B1D3503E92E368352A0501
-FD045A7D79716CA26C601CA2888B9E57DED1163C821C10EAFE81CF0461A92413
-BB96D2CBD385D17430F3DD50B260F58DB83423E826B9F55FE96ADC290621D17C
-8E4BD1A39007D3EFFB5EC104D2FFC18DF08E16753C26836752BCA0F190882433
-00D86B38E658215741C887494D161A56FDEC75FD5C4E3802318C3D2B72987F3C
-2DD3B75F669F2808F2A9C0880852A4A6236FE8A4AA4FFF753FB8E0403A9926F2
-73A342837512D46102279CC3B105A959516C9CD4FF86C704BD81A2DB5FC1BA55
-4798041822419EE5B201F48A1C182EEB9530D6205677136F81D3D911C98FB220
-C04E1532CBB717A68A5AE74FC5F6ACCFFE1ADBF194551F4E9E8C481C32345FDD
-4615B1EF62FB11C900DF204485616A9D37EA2B41E81EB1854570A07B76C7A064
-2C897C81FF81F703AD989D304CF7AD99F9B900681C935A9FD79C0188B3E2B50F
-19B15C3D95D0319406F917A31676DB06839E0180EB5AF09ACB81A4493CEF52FE
-F606841668FF02BBA4492216D789B6A3C4D9C3FA1310305E9878D7457D7791E2
-4F4749102F501AFF64C3EAF5A90B7B85DF090316D74ACAC512B040C19BBC61CC
-2534597944221052369729EDFF43EDAB917F2117353A8E76A6ED790FAEFD58CD
-7B0F694B156BDCDA89DDF6DCF2B47B71CCC037111432C562AF9C6B6CA1D1BA78
-FCD24F49127731799F7A0C29786E2DAFBE0A24DBFBAE0E9A0DCD44E4649DCB7D
-2916659DB0C65232B5CDCB015827F31A5530489B79A6BB45D68E19E3ED13D3B5
-31DC8454C68CF35E3E8FD307CB301884BDC0A03EDC4F08D4142E20494C59F6EA
-8CE8046D29869C7DDCA98EC906411C57957D1C8FC5404434250881714434B1A4
-5E368208D33D37066855A8BA7318DBEAABC15A83F2E1E50362142A67E443CF03
-E31904E3AC02993022789C3A1638A2056A0D94EC8D64E2A13CED8014C4F4FA51
-8F54801B2BDE7F9F2D0F656A09EB713E8A97793DC5E7F7005241AC5D45BF297E
-429C0CB733F1B86A28AE15CB627C98548AA0DFC81E7F62817989E325324AF65E
-C44FB6A9E42A270D789463D125EEEAFDA57DFD09C94F1354D5FB7B10D8F9F47E
-B6F581CFB243A6B634647EB496F2884CF4DEA98503F4EE906A38173D2A6BDADC
-A21B3C206B15BC842DC7FFB7022AF0F963177F310E971319B9DD3BCE508D4B92
-AB9B051FDB2851502D383EE103C4B0B232E32642E305838BD2D3936387816961
-762185C7152062F990585E9055F94BDBF7BCF46EE1E5D30558BCCB4C996F27B9
-05F40807866C255B81A55D0739041B5275A66F58FC149778AF1D2D90BD83397A
-33AAE594FF0A34FE74F524FEB43A223F8E29D7ACEB1E8838EB0AEE7A5AA401CC
-9D93AA03026E0879E9B7C7BB3FED71492BDDBB28EEE6860FC9E453B0A73982DD
-7AEA950B45736DB924A67B8E88945C2FD9CD01AEAABDFA43D12083AF7D4EB987
-FCD27CA7EDE61E5707AB481BC4B566887884C33C89A2D0B234D6135BBE98ADD7
-90BB22D3BCF19B4C69FAAF0F7946A8E3ACE5C933E2AB65511E861E3C5F9428B7
-B6B61DE712F224237AC705913D0C15E717D00F1913ACF411528D7A0BA81ECC2C
-EE9C5A09F0414B01AA880EAF1776C3C4C965FDA4FF258C2C10ED0C0F894F67DC
-1EC0876ED390CE114D4635F1F7837381CC94F52F4DA12FB9C700B94D75E282BA
-C68B284F09331DCA78387C2F262FFC436FFE0B62F304CBC8BA5C287736ED17EB
-7ACE389AC473AD84A72438FD57D3F8BC75E058F0ABCB016BE01ABC26E1F2EAF1
-406809EE7F30883E006C5D62FE0D92AF0FF209B881537F7B5A34443B9A94A6D4
-4C6749230716E53A28B429458A485D1C1530527C869EAC3DB8E0928515CA5370
-83D760905152AE563F58CD82D46F80BBD9D6CA797FC8720CBE190D7264D4C754
-4590D83891A2A01C4D43AE46AECFB938899BBFDD5A0719AB0B51BD705B33446F
-24DCFD6C9D7CEC05CBC7084CFC316B0370E9F9C5F3808822C8D29CF927C76BDC
-E6C31B044951C7F455686689CF06E8138A7B19B7CE1DFDE3343136DE9287DF1E
-81778DDC3BCEF0D6DA8DBD4D56D3E06FD6AE0B51EABDB7B52024636DDC0A2396
-D34630D3E3F47889DB84CBEFB6270B85E448E02F6E81A338AE0230551D629FF4
-94A5859462DCEBE89BA8E57E107F6AC587F79CF8B427C493A5C14AF7BB045176
-A9FEE5E34663AB3AF9A8CF714DD1DD50E18889D04110634B15674D68601C4ED3
-BC8B95B927E5B2E16880E1BC5CE1FE385A2D416973B52C1A2FE4332E964074E2
-94A69FC4946F579CCBC12BD381A80B5F2B1C662CB98138B58EBB93BCA99564B0
-98CF2EB381B04F005343633B163C4DDE8A98500B447D2BEB878AFE8982510794
-D276A4A6DF3D36B0ECF8CFE7D3ED4B364B08AF5012B5AD4BA29FF5886BDF1BB0
-72378D823C1929FB02BF7C9E41B483EE3D18817B056E8FA98FB9863D79EAB517
-54BECBF7579400AC5DF7EDE80E202AF75E66C48257A50390A9784BD6077C8FDB
-CBE3D17F8BAD802E97087A8353D3412C24B0F886AFF91D101A5833CDADF898B6
-DE548E996DAFF04D6CF8668A5CFCE8400C2737D0124A97083CC808CB80B24BD5
-0162448072D97FCD1FACC4146559DFFFA11BDDE0E2698D92A9733C10BFD23E38
-73151FA9C0D030872CFA02208A31647E1A7DD2C182044D90F90D48A9C4C422A0
-FB5A3A88331168A296EEDFAA02AEAEBFCA1A698BF8A01F109EF2FB767B4F679D
-6A39AFF1972E93364E5FC5E52CCB76B06560A8FCEFEA58BE9893F9B20ED2CDA0
-F0A2EFF2C9142A50B73A1EB3547C2B7954BFA47C590FC35260C75BA557A36AD8
-18CBBC03CC65C597F432FA0F0F27DB31EEE7F754781BFCD4EFF6570BE397BFFC
-35A7C0443A8172ED4FCB128DAA55D7A0AC14F9FFF97A43538C005ED8A1FB1760
-8D01F3440420FFFDEE149F036E278E481C35007888431CA712097362CFA27134
-36FCB600FD4C4541659571FC17B8136CF3860E2A41177C4E0B6B5E39B51ABC5D
-5B5D6D732DD3D122B956D4B4328F15252762249F5D50EE7E37FBBFCFE28B12ED
-48285FF811045768B7893A838F0E02536912157475D473DBB14CB666A00B400C
-276DB1129A8D68681CED61F7E21C5761AE13FC383F55BB6FF75579CC533AB682
-E2811BC342AD6E899EBB2B16632CCEDE09B05F9DEBD65591D8CE0B6EF0FEC4DA
-10A55429C85B679511962DB373C41EFAC813C0674DA0C2B02BFD0DC1CF82E26E
-15BD338FC3236CA8DA4FB3437442EFC077549ED51208497C6B074DFB6D386333
-C0DA4772232A367AC13665201336B291E8F08BB7B30F88A3959B21C0303EAC16
-BF5BA8B4F051B58028544D56A13B171BC76F3854974A0632E262C2B90763593C
-D85BA7A24030561D968C05E641F3A72EB769B4
+50C7821A8BBC3B9FDF899D7EAA0B94493B97AFEAC503EB5ED7A7AB600BF00E09
+8A98D1D031C430FAFDED5CFE3944C4818C6A0C98FF909FC1FA6F3E7E282BFA41
+4681DB8E2D5D12A2B653E32B01A8A9C9955AE525F963EAF4B07A6D1D08E880AC
+3D77B15077B8882DAB21B262E2EC978310BC07DB953F8C65C9D5D01F35FB5A9C
+B8C57B07209A07E1C0C1B5F1324B128B60D43C223F73DC12DE901CA5AAA63BF1
+2D47B7B0B9D35F25A459484BC917AD0D87779E379F2E5E5677F463D9D4E33B38
+99DF4ED7F1C5B33E0C23064233288FF324E07452C5DD4C46365512B412E6CF46
+DCCCB4EF51A65A8E2AC9A5BC5384F739AB8D4995143C9BD3599696884AF450A9
+0B3A707395DAD474797780AD0A87C8317DDC98871259B09B0038E5CA31E6EB6E
+8FAFD3D294971700EE6CF2D4CABAA8AE2C0965FD3E864037DBE485129CA30BCA
+3DEA01CCF4AC088FC977A4668029EDAC0CFBC69C930546E7B7EA31296D7F8B31
+0DB809DE11C0150DC81247B6259C110EF06F9B3ABC4641940EDF4CE46494AC13
+72C2933FD2B3288BD37E4055F58B0E83FF9BC369A112E9FEA4CDA525E3B92B3E
+932E64E549388DEA2C0B1F29B356A0E216B37B8742916B0AA46AFE2147532AAC
+A54DB16333B9B4B66665314F8028D1DAAA6BF0AA511DDA067041E465100A7824
+D778792F109404C1A5EFE3481C9E20007664E5664A3FFF70BE402C3BC84628F1
+2703294F2514048F2B8CA0BD9EFF679B8EBBC8E49A6909FDB6D9439E5852F7AE
+296746725B1840172ECB51B72B1F2F982740F7EE67F40D96BE2B8C310F98A980
+1116EA8A4D57850E5F87DA60D054A24BBA2831838C211B008BBF8E3683B8D407
+9A3AADB4AD7D0312D560FF2DEDDA60D0A353D797BC831E4A76A234F9AAA123D8
+1BDD68A4EFDAE4338358A616D29309A416B4962EB01F6DECB59E84A5852ACDDE
+BEFF98EAC8D864A4B457A6864A7C7ADD3EFD7B2EDB984A3D14BA84390B06B83C
+550FDEC4A8A1F60B8F47BF810BD636BA945DDA0C1ABEB31C80CC71DEA1DF420B
+D41E4D04512EA018C53422F1722EFBC78123B383C9BBACA7F62C5477BB8579B4
+471922BB21A881AB30840F1A076A3B14E7EFB5A0D04610F1D248B8D6977C7C24
+5C1307D468792CC180A2DDC3AEAAEBD1682951167D9B010A3F31F74A54114C90
+6B7E87AD0D74F6E64C225E4F6C93277084CA01C09DD7B7FA91F5D7FDF9C78C34
+9F40F5CA84E8341093AFF161914663BAD849119F4D56B5C880FBC709A99F89CC
+460183DFA77E9A8817F0488874D68F1E64F690865A6ED2FA92D4B0E08C51F5E7
+95767B6B3C433DF63FC5F8E77057C2B8194BF161C3F8104FD0FA8C4033914C21
+895DAB5D43BE63E461672613B9333FA125D04205FB9EF2708D83DF0D49483E24
+143531AE2C99F7F96F95AAE8E292E1879EBCC408CC102A32CEC3FCE958691227
+5446870CEDF38ECA235F19B62F7D83116DAE464E77EA2EF5F321EEA6E9C9B685
+27845D4BC456DC77767EE49F915496C84A7BDACF424378B835FE2CECAD2E3CEF
+366E0BEFDA94E1B4FD1D838CA676E002427508687E3535B681CD072B03356F5D
+C804A3D54746C4C7501E61176E7FCC900DD83AF1A73BBE3C3D26B3EACA9E6B30
+52430FA70C2266B17C1302659F6FD5857422D1AE32F15FC9F746B770AD6F45E1
+CCD6A402BA290917E96AE92061E801EE9876FFFF800C957D57D75EDC1199DB8D
+FAE3A98603A0964F0F05F2DECF98E798360C70AA89438452AA8CFC95C5BE6E82
+D12FF9536DB97DE9A2452013B2D95D81875820B57FB0DFDF9A4A778A914F2034
+F6A8373B81351C44D69CFDF430997BE3576D86CEE83156772E71A7A70EB0AEEE
+7621DFF6E101B32F7A2ECB0B9F02ECB4F54DCB54AAFE7978C759B116F84125D5
+401851A9360D1FDF438407FEE5843EA5E4062139D474A76121006923240EAF67
+CB93828CEC646D632F9F0EA8C20DDDAB3080BF7D774F9BBD6FDCCF38B3F560E8
+84D93B442FEA4E7EB429B7B9C14B276FCB8F39B6431A141E96A24106335B966E
+F3161D90EB9CA3DB6B3F7107D25590F7F4454D2B510A2C0B9764F80EFA8F060A
+9B078CFF276A88013D97FA5E908DE854A00FB655585B9AB0D22E9E2E86DFF0D1
+AAD10D3C1B0A34E9ED40E7B18F3AA2CB0EBE66F14A18615A0BB818A05B1B70F6
+D0DFEA076D71F8BE0978DBBFD62EC9ACABFF8703485899B12D3A68BE64B2A40D
+0D3650B42E55DCD5ED90A9CD2FE2EA64398FFE6BEC54E9BAD493D034B743A214
+5A5FD3B2AFE6FD112D73F393DD613359E7558840B0B9007483264A21F39A30E1
+239A08D90F3C11F48DEEDF8A549BAC0AB84C0CE01A39AFB47732DFBB03FB925B
+B72ADA2697186843116B540DAFC381F0BDF51FB554A7905F1FEC57CFFD19D141
+EF384F0D16F6ECFE47CD2515B9402BA6CA55D473250E3EB2DAC143823EAC583A
+BF749C1C1247CFFF1C0D41868B2CF0F6F0594D0DF2CD984757CFC86413A1FC6F
+3DB37B2CF2A2E04EBE7D05B2278EB9FABBF671ED8D8A5B1D1228C2F698240026
+8666021F7A977F2BB41CC6B1F0D3B7A46521C717285E5E61E936EC61196F820C
+C4C746560DC0F031B6797E67BAC1A518DA30EE8AB870F3A3531C781B4355DE1C
+66E31FD022BC5E8100A319F218D824FE4B0472AA8822C3F7E5F1CA5BFC2CDD93
+E1BB1B0A192842C39DB1B8703B81D1B8D8EEECD9832D321F903D7C06E724090F
+B7F4FA37064F1ED601E970091C9E99B5EA7BC06FE4E69E34052F065FB0331B07
+E3F6B76CEB7B7058EC5985AC310F9F502D982C43B144FB0A19A0EEB0E8D2D59C
+FC88340EEA8CF2EC23822956934954194DA3850C70B135FE2626D0B75C4CCB35
+132378CC7BEC8DD4F86A9B0B1D6C3A89BCA2C750DB5FDFED7BFA2C0A447C614D
+812FDD4000CC37A0CE6994E0C35871C426F872395C71B4566553D083CC436108
+7F50426FE26A03EB7877250BDCF09861DA35E0E92C34A6714244CC183FFE6F82
+C665A6408136EF31A0A50AB9C38AB284FCE23F867D12FF239654D18DB9100A85
+1FAAD02EC6F5B4AB691916A846CE953CAF5B32774D37E208DF38BC9EF3A5F680
+A62CDF924DDA39563128E7FE539FA6C2CE09F5C9F154BD523D3B1211EE7C5437
+128C316A8F171E3B75E27B204531BE59BD50374BF918DFBED45D73FB0E242B6E
+EFA52C5B0DB85952E4E6C86B301A5174920BD322C49DBB29EA44646676A4C4DE
+EBC9B61A279A3CEEDA2553D4B2136294074141687DB75364DD78E6815E9AE2EC
+366FF3E042726B039A9C5C193B53C808CBB0A498B7C80404754B67F7CF49145A
+D1B7E337076982EE64E6F76D31BF17C396A115A69E0610F25BB9E5DEAF5FECE0
+8319CFEC44B8549229993901FC72AA17351A442568754A3B5B4DF7B8061D73C6
+0B29DCEAC0DF72A6236D4BB6ECCF4EABC47713B2A609DC07D96740A769473869
+FD1AC9B5BC0137EB2A3327B51378159AFDB5BBF257F4E60F127828E8CFE74E01
+D968038F659EEBA34361CE6CE0987A80C7ADBC06D71C6E3D815989AD77551771
+66F1A1AAF42A3F7649DC718AB600BFC70E4CF0247AA2A4BFBD84771199AF150B
+78100CA83704D34EF7D65F51235DAD8A5882EEA58729CEF60CAD3683B572D0A7
+89A6DAF840DCB6C7AA4A4B23222D08087B975BB64809926B588A0300F0DE79BB
+320494CED7BDE6636F3D9D826D7353C2C923BFE00949B710611D9E3DE47C3876
+711F0135334980FBE4801C3BFF158F1FB5E2E5E388D8EC7689E92D8869A7C166
+1C4262C63687BC092675C23B6755BF2B107647A4EDCDBAE8E511A64ACEB9CDAD
+F15ACE64F8E8E4A9B2064C0FD8E446CAF1592C8F109376B98D4A5B31B15B2892
+7C0FBA025E497B454B25DA16D9C31F8C0BD17368499D3B1D92A06E5E4C8C6A87
+06E7E68C95975157BAE3712904797B50802CE069B74208F549710D978CE4A253
+C186EC2D6415479D0FEAA1DC076885B2A509B0E6411E6B5C8E0EAD7578997B9E
+C5DFA526E73CFA5D3839664B3470B1973FE1790EFE2A534A277AFE1B140E5669
+407396D0BEDEAD0A9B7B7AD54CAED5C8A70EEF86FB0045EEB34907E32204EC9B
+278C809150B70F1F086F756AFFECE6F05946C36C265EC6EE79F9A8659FF0549E
+33E4E750B3292799B3448560930996F9FCAF0B5083EE6F23B238A41EEB065506
+B63F6B94F6DE9EDD11947AFB257961EE4297C832AF97D38AEF181FED09CE97D7
+FDCC50CA3BA7332EE65E16B91F62CD678C28CD26B87DA984AE10BE0276366AC7
+7BE023637C1122C8ED16412B00637D59ECB9ED3DE6A6A816E54630DAD0E5E306
+1FC9A8070EA0EE84F2E59A7E4D814C8F766ECD9EA08A23E266F1BA97362D724A
+CB2AF5932D160D281A03342E28D57B55042D68827C831B8BAEB3A42E3A38531E
+36FC41EA30DAB3F1EC598A3E011099E5586F65C806A85629AF34351B3A24A8C2
+76E43F08449043C788C5CBA1B0EA703C100377540870DC8CB1898D6783B29D66
+23BE3D60C08251392D5060FEA9BE4A40EF55FCDF1CA4BEB397041CE284527907
+E6969695E657A1A75665CB7EA8CEAB74972919F286EF710A7D123E81F60F625B
+8BE0EECE4F52E73D0186ACD058D96721819B43AD03C98123A5892B4198E3304E
+1925512299560CCBA0AEF6F9FA2EEDD0ABB0D0649AEF7DA23DFF6EEFA2BF847D
+99A217F8665916CCE5518D0849D611C7221BDBDDC4FC0E7381A49DA520815274
+3934A0FB9435C721CAB181701E292D3368DFFC86613F755D4801E97D7B872E0A
+0F6E57A80363EF1DF156CD873C303A898A5D75D742E755D019DA3091B788A036
+0CAE670793C4CAC7A15C2DEE25E49D7697F17D2F4715C2DF7964F2F88C13D83D
+C06E6ABCBF412C543BE52A4166FCC090F12E66727FF1B01C8FDC772E52DDED00
+40EE0A60818F186487150B1E5EA3B73196834A2D201E6847E3EE97BDB9CE9B6B
+ECD33FB11216C18EC4E2CB7C4B8E841EDC37057FAB5AAF23A088C7DB0CA3DB9A
+67799B2629CE0E70610F254A87A925D3D107450F209F26481B5F416D41E26C55
+934226FAF151ED9FD52E19841CC57B3C45A5F9F15B6FA9C0CF8827EC69D372E9
+839B245139330A92B0F8F2E759D0F5E2AEE7A08F0744DAE19CA53080B062D3A7
+E1A07511FF4803F76AB6E51A80185E8734392059F3B1B9ABEAEFCCA68FBE923E
+3CFFF31A62C16BB5596DBEED2FA5F9AED96A0A42A8EC600847A1D80E24F63BCA
+D6E711FF7F0A96C1F87A8D70611B311F87A04535E4822A7FF4531A9B1FAAD13C
+4E80F5AF473AB4183C65CD87F6D9FF0E5FF6279E3E174314F3413EB629DFC3D4
+DA5B751031BB211DFE829F583DFCFAB20C9D972BD57B2C3B604141AAD99A922C
+38CD696CD05FCEB4035334B02A1FDEBAEBCE1672ED6BB7F83B5FECE3001B9F7D
+70B45AE7E282D9F9FBFA62187E7E0675969C232B581CBF4C6BBF10C5CE84C3D9
+1ADEC8110EA8566DDDCD81E0C00FC5D59BBAFFEE83C274277CB42BFF09D2AA05
+FA0D8BE8DB1EBF587D31A5A8E9C570302965B2F148833CC8C64FAED2FE6DD962
+4FDF21B46A8A9C9C54B873D6DD285C1FC20BCAA83AC67D7CEB023F29F00B1438
+3BCCF291746D6A04E176368398862D4394BDB6BAB8A24BFF5DE8848D5E250E10
+98CBEFC7D88AA7FE731F6B398BA1BCE100C3C3F602C11CC039FE279B7E46DE37
+0C8328B49107C6FBAA10E509A76C9A7D34A8B96418A36EC0B3F56348A1CB5763
+2314FBB223B0CB9C054730EB2D8F9BE48CB980024B624A3FD4794B22F18ADC84
+20DA169DFCE96CAC361942A22FCD95E260F46D1279F293F2709302539214D2DF
+70D1DF28377F0A99840226330506FB5EE3A0BD9BB02A99D840A3EA58C69B93E0
+50E7B164165A7EDDFD0E7A4083891E3F5A12653FA9AB3BF1C330678358A50910
+C65FE974EF46C8AC66CF7E16D27CC6CD372FDF2E7451BF5753B029E8A456FA07
+3207EF3EB547B319EEF01DEBC64DBC8A33FF83DB4ACBA00502EAD9B3D7CB8501
+5942A7617ACAFA1594657513F71FABD0BE842A5DC60D629D0C752D7632F7F047
+0E7C87CBF771837B5947273AE5DBD500A41B884E576488836F6A8612F93E71C5
+4D64831C34B6FAF3DECE28BF4B20E7A870AD5D0F15670E7886F43360C0BDF2E8
+5A55496CD838E57BD4A0C27610AB2F5F0A7D76C1AA97641260FA03B461A3D223
+3DE435A15CFD585F5BC82BDEABF1977D7AAF973C6207C632C2DC5EA4D6617101
+43F45CA50D60132309E8795D2B0B6927A0C06324307C6599521A9FFA4CB5113D
+7C23F8830BC9EBDBF923AC5B12BB34DE6E1C7C0129D2CF2EAA09B68DFF712912
+A46E032A2A575B214293E06ACB5DDCEEE77C39F3A9071D9CE655038DB4EC2A2C
+480AAC659FD3D18BD497A8F6C5446E2A6496AE279803F329CBB3F6923C53F965
+7B6801DE0D3B1E00A8F5BD2FF70782D962F31AE5C6D6DD32F9307A97CF121830
+157802BA4A56043F833402A7A383B94D79C80ED4FBB6CF188BB91E421165DE85
+245E64BAAB30690EB6C3A8E51F6C074BA0509AE82F59E74C7417D06C65202030
+D602637542CA33CFA6522119EC9E2F25814BB5A196E47146ECCFBC844D17A5AC
+18C1F640E28750D3B6856A38B14FBF3B3C70D4BA559B2DFFA01D112CD89F7F40
+A201D0DEADDA581EF4AC73A051C005BED84C7AE69C3AE65163E8FE89F50594C2
+67747A3724E89CC50075956D3F2BFFA490FB6C02CE988AD18F52C815F2BFC18A
+D1A86E95576C1076F955183310B6271FC489052140553A08F9E322C0003964FA
+5751F67640750AE533F7D90061AB9E487C4200A30AC0CB9D1D6B882631125FCB
+FA1B24573E504A042B2722CBB83D5701294600EBEE5AD470D1983D44124FCEA5
+51BEA2690F79C58BB913A8F6036B7FC87C5314B6960F52F2579337DDADEE0249
+B2207B7AE69D4AAD19E5CF36BA318FFA19324978B4DE4ECA1E66366B070175C9
+60529A88B19F69587F9F479EA8279312DE2F6302FA872DE1A623654D2C46938E
+4F92B56E3C1513F80425060B66928CEB8672DE30C722631FB26EDCD7883F914C
+4F07167152A21B6D4F7AA789841648EC8A6859EF4696F8E2A615ABBE54161E8D
+C79111FCF9F9C956C1DFA1B3462C3C4570C91D3720812182CA75C72CD4B1979F
+D6376F48212F466945C83A94F148F300A4FF573334D01AF0E6E37E4D8F918A02
+9CD4246AB83D1946D230FF9BE714BA3D5BEDD2D331C7FA68CFE88FC0AF6F89B5
+E515227F55EC66293FBB3FCDD1976B0DE8ED0766F8F60E44B7831E25672BF65D
+6DBD52D97FBE605A2CBC2E4B72C443D2F60658E81E2183BD70D4E66277560B0C
+DC0CAC9F41726329AE7208C956D246B45CD31AA4152D23468902E5903170F10D
+BB169BE014910AA9102F382BC033A26B4DE9DAC0D7ED7F848C9C9176805D4B5E
+8D47176190D1F7AA6F8B1B2F77A5358C3B44C21C3A4F48359DCBDE38F636929B
+F0D6140AD48F557516C88E2186B12D011573A188A71771F37E9FEFEB9781137A
+1F44F2C90F4204C3B018E015CE87976E38F65505E54DE894A2E9B292BF742ABD
+35521DBA016B6A3C1BE594C020B1254459D3334F92BCF2645A454A3AA0F9A40A
+682C816937D4CD2C392D396E6E14DC64CB72143F9C3925CED4A721ECA16F39C3
+06A04605C768344C64FA9C9B75EB4FDD28139BF786619544F0A077BC564FB554
+A59DAE6BC2058064C0106C4878418D6A124654B23D9354706AF7449C996199F8
+1D3DAA2A712A18CC214BECE73751E996933968EA5766801653EBC042D1B38AE2
+996900B303A56EC81141741E26F4310265D8E785B1BFACF7B6210F2AADCE5C84
+56474ED40D92666DEDC745E4521DBC1A26F26AD1319DE992822838EA3FAC3C02
+E4F185497747635D932FFBB6EEC172AA9B975042F665BD097556EA18AD19FF77
+CCF11C505E618A19BD21159748FCC9005C9F6BEFD4B3840307B11477F21B4C80
+C6CFA2E822731A4372613498B69886FA4F43E2423C73928395C85CA14C3D5EE0
+41A6FED4A65533409372897FFC229C88847204EA16770DC57FFDCB88FA7C69EF
+EBE08C4EB56DC0D1561023AE4F4057C138FFFACD7E0B7E4C3059B168492FCEAF
+39218326F9C53CB151479639A0AB8CD5B7EAC4F53C9D54C2B91C2D6B42124C40
+C6F69ACD9B93A1AD62F37D68A35E59EF96A332ABE5CD1B52F8BE81C98EBB5C6D
+611D98B24386832ACFDB35AFBC089181D91814CE1098799B6453E7DCD921BAE9
+92760955D4729353B1B9316BFFFF1F9395BB293244D1F2B05D5934830084A81F
+C723CBC710F0CAFB8E79D6376D874DB0DE06022FD1E9916FD034382C24D35B57
+A93B81C632F39ED08B37CBD0026D727AE8068912566BB5474F58EAA977B02B87
+3162B42EED393667CB88AB5AD10EDE4A40D5AF10955DD0CB0C99FAE88AD6FDE6
+56F222885FB42190FF4882D51DBEDFED76DAB1F9404C4723B6D7727238E1C18F
+9E607AF6948E851569349ABCC415FDE3DC33F3BFCB410FC8B9773349491AC74F
+247BA3B60D1E6183F8A666AF584453037EAD347C6C6AC7D8B0124F398AC6A323
+FCCC15CE4345B56BC2CFBBD17AC5353D60191D0E3C9A9CF78DCCD46DF5F94C08
+A012B7618901095688C82869D11824493806CCD4FD7F90A3347586E6681D260C
+168869AF2A9D1F16637484D4C81382EE66B08BFFDFC57EC9FF815B1B8F60566B
+A405CB9BF6EDA6C9030FBE770F82DDBE998CC1A21BFF7BE67CFD55FD0EF86249
+EEE248A9CD8DE1CFB4CB8B100D29E8A2E50324F7D716A6AC7745BC307E74261D
+9AC05E3A9BB4E1EA6D434C82DCC2675CCE0AB1AFABCE03F8A938321257A15ED9
+71FFCE05DC19AB211D1907BB9DC032004EC6AD80AE7342DA9EAD9B6EA8AF4DD6
+E022B3DA7D187B42BE8D6F0682FD89F4283AC87D1CF68B6193A500539C7E0280
+DAFDD1A43E0560D2FC444BB9A949FA408F7F7E130E5D1656F2355FA7264B57B8
+40A70366CB14DEF5908C1A69B8365DC0CBBADFB4B82B2FE6EB68DDC9B1FE71C6
+2D61F5A48DBDF1BC8A9FE9D81CAE0F95A2FA190FC194A94623826D4A76D24132
+3A3A453D71E03414205A14ADD34DE6654972FCEC6E77BC7F988DF7212D642FC2
+86D98BA69B2CA28426880D25B97B845D3B0BE5015029F37BE17AA11D4A457118
+08F97B141DEBBA2F4EFE542CDC3AFA825338ABF0CB919718DE8C3ED384AC8078
+10BB680A52115C92AC3A6C75CF5D9BE57277BE62A0C638D058B6FB4F22B669DC
+9BC239891E3006D13D2B74A8878B8D932F12E4CCA70E5DBA1CAB0EF0D7EBA6F9
+8C89FE5A4DE66FD55579EA6E0D0B302AD7FAC851FF41E1B50BF2771D45BD4287
+A3712CE3E26C1634C30DC6E0C2B2B9BEFED266A65DA87505B05725D9E882496A
+3A2D9BCA03344153528C694F151250CF45ED116291453BD9C364372F19E3E047
+3B2E1268377C5F3D60376892D49EC914156AC19102AE4B83FA1BCA49B20596EE
+73A6B8832F30BC5440C076A5C79E61204D8DB5C99D885955723016C7E93218D3
+3F1DE9F004F301E134966BC7B30D87DCCE1EA53863D0C4231E6FEBA239CBE110
+D00DF9F318F77B6A55BABECB54FBA883110D88F2EAA5837954B88278801F1FF9
+DF37E6642449A7296A34CE8D14B32970C37A013A83D60F9D5F3CCE70E80E3AB1
+24DB2F9982D9A1281B7792BDF5EAC3473422DBBE5492784BF5B0DEFBC6FE05BA
+283506E84F5DB90E5D31A94CB84FC593B9A12B2F48DCBE4F0567CC6ADDDBB8B4
+359C3EF63045D4A4B607DA8CEA2EF305D9AFA2EA059C061E8D877E10F2517910
+2EF8EE46DD88AAB0CD1366B226D48FAB68294269E30D032A859B1BBEDB38D679
+4C545E8D4F32E78764B36AE45E2DB298ADE78DD1661D73BBC892EEB03D3417A3
+39F4DB9D20F260885EE5D6900CCD091152DD0DDAB60EC66CEAB06E4CF987F90C
+1D4E74BF853A04C2B74601E743F52F0F29D2D05FFA0B6BACC64468CF62C0A2
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
 0000000000000000000000000000000000000000000000000000000000000000
@@ -2141,8 +2146,8 @@ TeXDict begin 55387786 39139632 1000 600 600 (refcard.dvi)
 33 36 51[26 45[{}19 66.4176 /CMTI8 rf /Fc 242[61 13[{}1
 49.8132 /CMSY6 rf /Fd 134[32 1[43 32 34 24 24 24 1[34
 30 34 50 18 32 1[18 34 30 19 27 34 27 34 30 11[45 1[34
-2[41 1[45 54 3[22 1[47 39 41 1[43 42 45 10[30 30 1[30
-30 30 30 1[18 21 18 44[{}43 49.8132 /CMR6 rf /Fe 134[43
+2[41 1[45 54 3[22 1[47 39 41 1[43 42 45 9[30 30 30 1[30
+30 30 30 1[18 21 18 44[{}44 49.8132 /CMR6 rf /Fe 134[43
 43 59 43 45 32 32 34 43 45 41 45 68 23 43 1[23 45 41
 25 37 45 36 45 40 85[47 11[{}25 66.4176 /CMBX8 rf /Ff
 130[35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35 35
@@ -2164,9 +2169,7 @@ TeXDict begin 55387786 39139632 1000 600 600 (refcard.dvi)
 %%BeginSetup
 %%Feature: *Resolution 600dpi
 TeXDict begin
-%%BeginPaperSize: a4
-a4
-%%EndPaperSize
+%%PaperSize: A4
  @landscape end
 %%EndSetup
 %%Page: 1 1
@@ -2223,7 +2226,7 @@ b(curren)n(t)g(searc)n(h)815 b Ff(C-g)-450 4125 y Fh(Use)27
 b Ff(C-s)h Fh(or)f Ff(C-r)h Fh(again)g(to)f(rep)r(eat)i(the)f(searc)n
 (h)f(in)g(either)h(direction.)-450 4205 y(If)23 b(Emacs)h(is)f(still)g
 (searc)n(hing,)h Ff(C-g)g Fh(cancels)h(only)e(the)i(part)f(not)g(done.)
--358 4311 y Fd(c)-375 4313 y Fc(\015)d Fd(2006)h(F)-5
+-358 4311 y Fd(c)-375 4313 y Fc(\015)d Fd(2007)h(F)-5
 b(ree)22 b(Soft)n(w)n(are)g(F)-5 b(oundation,)20 b(Inc.)27
 b(P)n(ermissions)21 b(on)g(bac)n(k.)28 b(v2.3)1746 -364
 y Fg(Motion)1746 -201 y Fe(en)n(tit)n(y)e(to)g(mo)n(v)n(e)h(o)n(v)n(er)
@@ -2488,7 +2491,7 @@ Fh(sp)r(ec)c(sa)n(ys)g(ho)n(w)h(to)f(read)h(argumen)n(ts)g(in)n(terac-)
 3942 3605 y(tiv)n(ely)-6 b(.)32 b(T)n(yp)r(e)24 b Ff(C-h)36
 b(f)g(interactive)26 b Fh(for)d(more)h(details.)4235
 3736 y Fd(Cop)n(yrigh)n(t)4538 3734 y(c)4521 3736 y Fc(\015)d
-Fd(2006)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
+Fd(2007)i(F)-5 b(ree)21 b(Soft)n(w)n(are)i(F)-5 b(oundation,)20
 b(Inc.)4399 3800 y(v2.3)i(for)f(GNU)f(Emacs)h(v)n(ersion)h(22,)f(2006)
 4532 3864 y(designed)f(b)n(y)h(Stephen)f(Gildea)3942
 3956 y(P)n(ermission)28 b(is)f(gran)n(ted)i(to)f(mak)n(e)h(and)e
diff --git a/etc/refcard.tex b/etc/refcard.tex
index 42a2cba4456..8c8d3288841 100644
--- a/etc/refcard.tex
+++ b/etc/refcard.tex
@@ -14,8 +14,8 @@
 \letterpaper=1
 
 % Nothing else needs to be changed below this line.
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -63,8 +63,10 @@
 
 % If there were room, it would be nice to see a section on Dired.
 
-\def\versionnumber{2.3}
-\def\year{2006}
+\def\versionnumber{2.3}         % version of this manual
+\def\versionyear{2006}          % year manual was updated
+\def\versionemacs{22}           % version of emacs this manual is for
+\def\year{2007}                 % copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -73,7 +75,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 22, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -271,11 +273,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \title{GNU Emacs Reference Card}
 
-\centerline{(for version 22)}
+\centerline{(for version \versionemacs)}
 
 \section{Starting Emacs}
 
-To enter GNU Emacs 22, just type its name: \kbd{emacs}
+To enter GNU Emacs \versionemacs, just type its name: \kbd{emacs}
 
 \section{Leaving Emacs}
 
diff --git a/etc/ru-refcard.ps b/etc/ru-refcard.ps
index 8a847504d9a..108beb7b80f 100644
--- a/etc/ru-refcard.ps
+++ b/etc/ru-refcard.ps
@@ -1,17 +1,16 @@
 %!PS-Adobe-2.0
-%%Creator: dvips(k) 5.95b Copyright 2005 Radical Eye Software
+%%Creator: dvips(k) 5.95a Copyright 2005 Radical Eye Software
 %%Title: ru-refcard.dvi
 %%Pages: 6
 %%PageOrder: Ascend
 %%BoundingBox: 0 0 595 842
-%%DocumentFonts: SFRM1000 SFBX1440 SFTT1000 SFBX1000 SFTI1000 CMSY10
-%%+ CMMI10 SFRM0800 CMSY8
+%%DocumentFonts: CMSY10 CMMI10 CMSY8
 %%DocumentPaperSizes: a4
 %%EndComments
 %DVIPSWebPage: (www.radicaleye.com)
 %DVIPSCommandLine: dvips ru-refcard.dvi
 %DVIPSParameters: dpi=600
-%DVIPSSource:  TeX output 2006.07.17:1737
+%DVIPSSource:  TeX output 2007.01.20:1526
 %%BeginProcSet: tex.pro 0 0
 %!
 /TeXDict 300 dict def TeXDict begin/N{def}def/B{bind def}N/S{exch}N/X{S
@@ -58,299 +57,6 @@ p -2 w}B/o{p -1 w}B/q{p 1 w}B/r{p 2 w}B/s{p 3 w}B/t{p 4 w}B/x{0 S
 rmoveto}B/y{3 2 roll p a}B/bos{/SS save N}B/eos{SS restore}B end
 
 %%EndProcSet
-%%BeginProcSet: cm-super-t2a.enc 0 0
-% This file is generated from `T2Auni.map' and `glyphlist.txt', `gl-other.txt'
-%
-% LIGKERN hyphen hyphen =: endash ; endash hyphen =: emdash ;
-% LIGKERN quoteleft quoteleft =: quotedblleft ;
-% LIGKERN quoteright quoteright =: quotedblright ;
-% LIGKERN comma comma =: quotedblbase ; less less =: guillemotleft ;
-% LIGKERN greater greater =: guillemotright ;
-% LIGKERN f f =: ff ; f i =: fi ; f l =: fl ; ff i =: ffi ; ff l =: ffl ;
-%
-% LIGKERN space {} * ; * {} space ; zero {} * ; * {} zero ;
-% LIGKERN one {} * ; * {} one ; two {} * ; * {} two ;
-% LIGKERN three {} * ; * {} three ; four {} * ; * {} four ;
-% LIGKERN five {} * ; * {} five ; six {} * ; * {} six ;
-% LIGKERN seven {} * ; * {} seven ; eight {} * ; * {} eight ;
-% LIGKERN nine {} * ; * {} nine ;
-%
-/T2AEncoding [
-% 0x00
-/grave
-/acute
-/circumflex
-/tilde
-/dieresis
-/hungarumlaut
-/ring
-/caron
-/breve
-/macron
-/dotaccent
-/cedilla
-/ogonek
-/uni04C0
-/angleleft
-/angleright
-% 0x10
-/quotedblleft
-/quotedblright
-/cyrflex
-/dblgrave
-/cyrbreve
-/endash
-/emdash.cyr % CYRILLIC EM DASH
-/afii61664
-/perthousandzero % PERTHOUSAND ZERO
-/dotlessi
-/dotlessj
-/ff
-/fi
-/fl
-/ffi
-/ffl
-% 0x20
-/uni2423
-/exclam
-/quotedbl
-/numbersign
-/dollar
-/percent
-/ampersand
-/quoteright
-/parenleft
-/parenright
-/asterisk
-/plus
-/comma
-/hyphen
-/period
-/slash
-% 0x30
-/zero
-/one
-/two
-/three
-/four
-/five
-/six
-/seven
-/eight
-/nine
-/colon
-/semicolon
-/less
-/equal
-/greater
-/question
-% 0x40
-/at
-/A
-/B
-/C
-/D
-/E
-/F
-/G
-/H
-/I
-/J
-/K
-/L
-/M
-/N
-/O
-% 0x50
-/P
-/Q
-/R
-/S
-/T
-/U
-/V
-/W
-/X
-/Y
-/Z
-/bracketleft
-/backslash
-/bracketright
-/asciicircum
-/underscore
-% 0x60
-/quoteleft
-/a
-/b
-/c
-/d
-/e
-/f
-/g
-/h
-/i
-/j
-/k
-/l
-/m
-/n
-/o
-% 0x70
-/p
-/q
-/r
-/s
-/t
-/u
-/v
-/w
-/x
-/y
-/z
-/braceleft
-/bar
-/braceright
-/asciitilde
-/hyphen.alt % HANGING HYPHEN
-% 0x80
-/afii10050
-/uni0492
-/afii10051
-/afii10060
-/uni04BA
-/uni0496
-/uni0498
-/afii10058
-/afii10056
-/uni049A
-/uni04A0
-/uni049C
-/uni04D4
-/uni04A2
-/uni04A4
-/afii10054
-% 0x90
-/uni04E8
-/uni04AA
-/afii10062
-/uni04AE
-/uni04B0
-/uni04B2
-/afii10145
-/uni04B8
-/uni04B6
-/afii10053
-/uni04D8
-/afii10059
-/afii10023
-/afii61352
-/currency
-/section
-% 0xA0
-/afii10098
-/uni0493
-/afii10099
-/afii10108
-/uni04BB
-/uni0497
-/uni0499
-/afii10106
-/afii10104
-/uni049B
-/uni04A1
-/uni049D
-/uni04D5
-/uni04A3
-/uni04A5
-/afii10102
-% 0xB0
-/uni04E9
-/uni04AB
-/afii10110
-/uni04AF
-/uni04B1
-/uni04B3
-/afii10193
-/uni04B9
-/uni04B7
-/afii10101
-/afii10846
-/afii10107
-/afii10071
-/quotedblbase
-/guillemotleft.cyr
-/guillemotright.cyr
-% 0xC0
-/afii10017
-/afii10018
-/afii10019
-/afii10020
-/afii10021
-/afii10022
-/afii10024
-/afii10025
-/afii10026
-/afii10027
-/afii10028
-/afii10029
-/afii10030
-/afii10031
-/afii10032
-/afii10033
-% 0xD0
-/afii10034
-/afii10035
-/afii10036
-/afii10037
-/afii10038
-/afii10039
-/afii10040
-/afii10041
-/afii10042
-/afii10043
-/afii10044
-/afii10045
-/afii10046
-/afii10047
-/afii10048
-/afii10049
-% 0xE0
-/afii10065
-/afii10066
-/afii10067
-/afii10068
-/afii10069
-/afii10070
-/afii10072
-/afii10073
-/afii10074
-/afii10075
-/afii10076
-/afii10077
-/afii10078
-/afii10079
-/afii10080
-/afii10081
-% 0xF0
-/afii10082
-/afii10083
-/afii10084
-/afii10085
-/afii10086
-/afii10087
-/afii10088
-/afii10089
-/afii10090
-/afii10091
-/afii10092
-/afii10093
-/afii10094
-/afii10095
-/afii10096
-/afii10097
-] def
-
-%%EndProcSet
 %%BeginProcSet: texps.pro 0 0
 %!
 TeXDict begin/rf{findfont dup length 1 add dict begin{1 index/FID ne 2
@@ -424,1058 +130,6 @@ BA9D46A1C3CBD3FEC92F0C2D2207B273DC24E300E83AB9EED3EBBA394BE52DBA
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-%%BeginFont: SFRM0800
-%!FontType1-1.0: SFRM0800 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ecrm0800, tcrm0800, larm0800, lbrm0800, lcrm0800, rxrm0800.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Roman) def
-/FamilyName (Computer Modern) def
-/ItalicAngle 0 def
-/isFixedPitch false def
-/Weight (Medium) def
-end readonly def
-/FontName /SFRM0800 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-203 -320 1554 938}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1CE1787EC5930A
-CB162F5B9EAA313D307A0E184C13434C1BD022B99B5412C3C2CCB7E80D459D72
-6BD901DE4D3AB277B44856DA45D8E2155D76F424646B1BA2A4DD97877892544E
-FDC803CBA09D705D43E883FDF9F79A6F8A3CEE49E2407F694112A0C8454F9289
-C328AFDD8890E2BB9C6AB0315D44440AA4F02E7DE2860008607D0237138D37F5
-E0A3F297B18B477AE21A280BFD3EB80E6AC595A0FFC1521A9A4A11FC2937DD74
-E0E81FFCF3EBC70EC3906FB4170A07926FECDEBC9BBCA5C4CA3CCFDDB392437E
-B397A1B6F635A11085E9257B704C2493DCBB627AEB9DD147C72542E1B69F31E2
-A63866E965A1199F5BAD6C11DF3C2415B138E97EAE546C5FBD2819EF84822E71
-04E346196E4B796D7EBE41F2D952A20F347736433B140818D6124A14A8255758
-FF27AE2CE7928A38DCDA7488F5EFF44820F7BAFF46F01FB08E3BBFB5AC0E62AE
-591050BF6E2E03F44DEDA8ADEBDE4C9DD2720E8BB2E7C89F80871A39CD4E9727
-784A87B911491BA13540746426543291BE73DA5FA01E47A5033DF15B5CFAEA9A
-2FB4F86960E14829DCED39A2CDA20655EAE3D9A9FA3B75D97F81EBEBEC283DC8
-EFC417FDB1158C194B8C21EE962CAF2F3CEE9D5D3B7E0E068D8FB28434D54A22
-570A504018E35E5A5D1C6A8229A99A44D0C2556460DDC78775F03A6093BBFB42
-BCAA36262CCA0420EA3B963A5FD3753587DB2DF74C7E087631C219CD2FCECD1C
-C91C552E195D2B9BF9896CC9853BE8714F7DB317EA3224199D021C57FB5F5020
-CDEDD97680DCC51FF73857F4DE131A37AF43FB1DF859AF41E9061111F3941D2B
-D641B845836A57263ACB3A516326029734D7839347248D320852F5CCC677E953
-78A28E7EE1A472EB31BB93B946143A1ED8D930CF195D0445359AE31AE528FB13
-1D87EFEB0200CDBC35CAB95FEB55157A0115144EA5771B7639B4216AC1E9DE98
-AE6889CA0E236D265F815F8E6F6CFD416727119FDD7A16AD079A9D6269E3D47C
-19623A9D31E27EB3689830029A77E8902838DC3B5C4F131C1D25A062672CD203
-4880F94B19FBAFCC9140BA35F54557DFBC3467DD4CE7F8000D71140AE1183D6E
-D5C1D7BB98DB92519A8F57C668755A4A81F46A0C4A01F7BEC519652AFA5F3C85
-0C326082DA3A3003ACF66F2F79D42E2E0BA83FBE69DABD78E652C2F30BBE8FAC
-323EF5A61C3C91A3A139F60B9020D1561D3EE22BBC33950B72719B354E67F57B
-5F9EA0BBFADC0778035C26D33B1E958A5F53BBE99F6DCCF1D50321133EE1307F
-8B58EE812475744CBD3C65762F194BAF8EF1405968330DBEFE8C3E172B5A8B48
-5A16A330F1A782BE7A11B64CA962A42E771F6773733744ABFED58E96F78C2E50
-23A96FA936D1071EBC6837AFBEEE6CCEFA7384F1616D325A4F1E267E79AD9FD6
-2A998F77DBA3A320DE1C232DE21D1C0B66CD9BFF71B8538459AC97D827C7F84B
-66B6170F5272B7BA365964A12653F10A88E4A95E1716E3D1A202580A233574EB
-2A2782F948787DC4FDE207F01D6D3B0C66F25E94F86F24A92A2602AFDB81E6D7
-CC034B232A0D74E8EFF35D7DB57AF27BA09A5F4C064B9BB83253A236A4D2864D
-9B5B8FC933F97DADF735C6B7B778DC72CB1A1E42C71F16AAEA3274474B7B295C
-1A0F09781A22DCC8B8EA7B18FD037257C110BDFD84304EEDA172A99BDDCDCBFC
-3CFE4FB3E4D7D97069E9178CAD5205CF89589C565B8A2B647427475D16E6CD0F
-CBA52E75B6516E19D7710CE3BCF2EE5A72718963EBE9CA74F3B0C9250C31EEDB
-0736EFFA9A358EC45930779B7C9D69CF6BCB12D9C22F926E0F2D1C619E3BF64C
-536F2D6E8E02476647E85C431CDD93F911D0A9AC867025B919C25AB8A2F999BF
-8065FBEF2CAD38CE90C43D1908D5ED61CA4990F2B00074FD94A8B8862158C876
-6928604E5058FECC5E0F3040E33B3A028630AC0E2778C9F8B82591AA72971FF4
-C9F6D17EDD30DCA06F06577895783EA91A820A14D693E9391F6345EF715C5FAF
-9982B447F2D5968DB14B3E8218F367505881414A43EBE15A0E494E11A2DF77B6
-00F65B9A7CBE85F9578FBA23B1A84BC329C53782F73CC58F848D679F04375B9C
-FDC2C6A856666973F4594B6A9B2F03E11F3655959EEB4DDB3F7E7C0D6AACEF81
-F55C426E394175D4F7C895527B5C25240B5C3716E12A243C9BC54F4581C1D433
-65D2DC3E2476FF711265CAF4C37572FCB0D341ECCC7612DD60816E2359CE0FE3
-33FCA575AF040898840134B1E41216806B476A6F56A4614EDC35601E3AA6C0D7
-BAC635775A95703ECE3404FE13BB2DCF2B1E413DDEC853B3DC6D09D96C07FC93
-E96DBDED14F568946C078E41FF3A7C5A058192076D3D39705960D396E4C0A637
-397D08ABA6AECB50B75FE8B344D4237442FE1EE1671D327D3155C6C7E5D26CC5
-2AD6CF713CE61711E44C7592A4F88A8137188FFB9C981BA8C294958AC2048F22
-F444FB867F7FC0A39D60BE6CC01F861FE10D6693B1020F5B39E3958EFD88EC7C
-9BF7316F3F299316809A62AE554D1874EA8F9CC95F26FFEB4EB4E5E0A922FF89
-60E5F9713407B087EAB33A3F768CD5A6F63A6239734C4B7E5AC5E9D63A3107AC
-C1BA676430F0C5C492189D0393409CDCDA952861B3446D798258C632E7268213
-8EF5BCB006353594BBD7BE9385F5978CDA7A13B531AE44224664FAA4E23357B1
-0812E2B8DD05845147DF0967B287FBFE762B859879666549FC7650A0B973D413
-4D0136CA2DE0015CB0206A1CE8C80875B760A3F8FDEA267F6C015FC8EA05AB22
-6B2FDF7D9E62685CD4005000132921E636E9F3805372A2BE42F3D6F504A691CF
-A9BC37EAEFBAA3F57514891FC67761C0F2A1DD706030BF20D49714B3BAC04612
-25359FAE96C1B4AC7858B02D0ADCABCECC56BE5767F216185055E36717092CA7
-8B984ADD891A991B2009B4DD384A4C293D71261F056DD1E351307D32EC613F3F
-A299289B28EA48B83A1FD1E87AA060CEA042816BA7B43F3CC04D9613309C5A43
-E0A3FBA8A2871EC62679EDF0E9BAF8FC3B56C5E37E69EDFEBB6B24D65132203A
-934884BAA87B0D5CCD3353432FAD28C3104E28F1B40621DC4981C49010267477
-63D2683A51D3AF2D6DA8D68E8C01DB68EFD8918344FE3D71BD64E59530B4C5C8
-5636E79B44E6346BE0AC571C31CA133567D66FE5A249CA1F398E66944DC2DF54
-5D0A6C526B1757B2A33BFE7C2212F1D8DB22470CC69C301094C3CC38998B6719
-E0EA158B8AA257AA5481C600B3B2B80B78914E1D232EC35DCC8588CDC4486639
-9877B3DDF7350A2D1E3D84C87C7BF119B71A4BA78303623728A8EDE4273BFF14
-BB7E08D5D985DDAE015BBCB27DC4189230B5771E456510B2AA4A5F5226E2AED0
-AC4101D0EF51C36B43FAFDB3135590951DAC29A65D9ECD9E12114C8E8AE1FF43
-37F8F8F140A361A9FD262DF82DD5E036FA36A2FCB2966E603304077B139B5F18
-1FF4FB2FAB3F70812510AC23802A8039FAAC38379F28EBA7D7C1162573F54297
-DEB65860CE160FC724A35D44D5C5419019CDED21DA0240C8E58FC086993242A8
-F3E97D7E71C8F6C3940B254C9585AFC8392A0F3AD37C946DE09D0FACFE96A27A
-9F47B1BD06E56E03019A715C990C07D59B99FFC4C87D544B17E2A1673FD790F8
-C597FDDAAD58CF3E9F892D369B6F12BAD38D2BD275F52D2032CCA601F9616170
-C9F2F765BCD98F4483FE0BF0141BBD66BF824489624F7D704DC64C8FD286E358
-4BA8F9B3C73D34077A762913DD926E05A517978A13D9B3A0E8776D9D14B16CCC
-772B792396A683BF9E6D882110D14D8CCA6B5D4ADC3474D0497793CD7A345633
-40F4C5D18E8E035185C3A6B25CBD51A7811E110C733FD4AC67CC6B4D451E2F8C
-15F50D7E6BE0C38A556DA239A35712BE7FB03EC02F14F045C51AEDC2771321F8
-DC37266F6E98335E02FB736A5DEA95A929C10BA325299F3F8B3231A8FA2BB6F2
-648779D5FAB6F4C068C0F92E18ACECE3210433FD33A74B2AB42E0E55627C5ED7
-6A531AF2322A19A6C4BCE5D714E2ED794E4F789CFE3F18C589F8D5969A7E8A80
-10DE1F1D17CAFE9261EAB031DC3A6C7481AB5B7E8EDCB96BD0A129E45E3151C0
-68C4A3466D34DF751FDBEB2B123B0269F5D58746AD3511F899AD73546D90FF3C
-889FA0C12535CF9BF81ED5D22C7D4488AB58231EDAD7FD489E95ED64025A6E56
-9079B19F4DAE58F4A81959C7F00B0C8DC36AAF162BA35CAD61832DB7FD0E3C47
-6FEF3616C3EDE4949F89257B8BC394FFB4123025C83DAAB2E41CA448F1A2A7AB
-9F9C16115A546B05EF3E68182DCEA45E5BCA3828D480A07DFDF715B0AA065007
-7436CF8E9C7AD5CC2CB3A323908F04EF6C58A3EC9830DA6008CFCAECFCA51597
-9287566B045913228B9AF937E995DE25B164F92ECE2B20CA39C37DE8DFA27027
-48557459EB0ACDA237C2820AC7D469DFB04BE8629E396F7AA969DB6D8A7A8727
-A4ADF741F0A0CE065EA0CAA4C01A872FEA4D2366A41F749A4A0F3DBA016E91B0
-437AA1FFFB75C1502F623E4865D842640BBDA869DC79D81384246D8C9C333263
-ADAEADFBD4B2909199F3FDDF8A406D54E730263FBED4CF2B0DC261F7600746F7
-1F3104A0BF7795EE5AD69C09BB0E65DA90A6EAACC67DF5835A1564B7B8E7BE98
-428D5D83FFA1C9F60AD9B71E44E5D1F0F33BDAFB33725FFD2BFF11380DB62D8E
-F40B50A4BC239A64B2BBA2850B923872199FA302572EECC7AD678C17BABBF100
-3A76077C2F2C646FEE56CA4C83717D5F912782D18DBB716F848DDA5CDE379CFA
-A4246F698186DF6558A7D73A1A3115508AE417718F8E96EBE70EAFC48FFE9F6B
-AD4E45069E37ABC2B016D44EB1D7C5E2B352E3D552B3DE731DCB114ECEB901FF
-7212B8EF53ED117AC42C40E13EAD24FF248D6E1D4489388506EB42D43FFD22D0
-69C017D667BB9A7801E03AD41CD762C34A2D2D294D50C9511CE4AEAB1E4868B8
-F192141752BDD0DF44B76E01404DF023E59BB17F002EA5001C5F0026D1B964B9
-A39EBD2C0345683C7598991B7971AD959C8114374E49BF0E8147397C65FBEF84
-3969219FE11DC103C8A473FD7BCA303E026431BC89297BB7E463A1AC0DA1339B
-26A213AD5635DC4274EC6E0EBF2F3DCE3172A31E9E8B0E8F028A09EF4454C3A8
-A2039CA50A868AE11D05F5D4C08C461346EFAA3A716151F6E7C12DBF7CE8DF3F
-CC1E436036A002B9839348ECE1A1643925A919DDA56F30DCF88F5999DBB222FB
-502BF42DEFE71EE90CF70EF4A2F176691D987177B4ACD7F70E20616F63B60836
-670B842013D42771E0482BEFB1750AF50DC5A509E50078B49AB90AF028658E67
-0A48BCDAE45C2EDF35C92C4A5E96679AB95ABF8B013698ACE11CABC3E81563C7
-BD442DBA7B5AE87EEC9585C1DD2DF76F3ECD59C0E937396599CCEC208E1D791F
-330A89AEA2888BC36C94595CA615CB84755194506AC7A83AD19F7F19B58FBC36
-DA6EF5A42E268B80F6B6425373644C10714EEFDD6ABE83B981B1A28CD4CBF1BB
-3D95A7B4F265303970278496B58FB9D855EC18AE2A2783A9B6A04D651FAD2DBC
-264C5528CAAC1CC02764D6C138FAD877C8819C937980087C603273FD3BA5E383
-0CF794C8A21BD43EC2C275EEA8847678BF001B4794A52F7867C683D88F1E0541
-6088FE17CE3764D4B737D0DB9A5DCB66DF0F65EF55030C2CDFCB9D1D32F10757
-E7D4C6BF4B370BEC69C7EB84E9764345E0AC515004CF15320E474D48E58E0D11
-05BECDAF170FC211987093310CB0E76F4BC6D524397F787290D7FF8C6777057D
-96CFB3D350CEBEC3F5C9C4AEE1C987556F5DAFB74B28726C5F214187552576BF
-80A50BB8D3E118A48D07852E2B94339C5E0220FB8FDE941E8D74793648762A85
-120D97E46E70E403CA4324D3B14BEF58BB62086217DC4B458BD70438009C4FFF
-4F67D4B68E9063DE5A12CBA6053E07838BA7E80EBD64092A555214F34411F968
-716E4F331166795ACC5DCB27EC72DE470B6199C520CD0A5FE74E649567B4255E
-E18A915ABD4070E7C2A9F04C4DD5A9ED0D90124905E2515A3A522C2B09385BB1
-2AA42E87FD05BF715F47EBE8CD44F1FB810CE30F5A9149A77CF01347412F127C
-C4E8432018559C0757C1ED0C5A1B5B3D53FBA5F534BB79BE22811CD7BAFF119E
-F9DA7A6099E851E6312F5475669445A71FC40FC02BA0C651AF60E24140F72BE6
-15EEEF43E52454E7251BE2E0950E313AFF4BF6EE7EE405A09CF4893F756A35D6
-E9E687F69754A4FF7D6CFD5DA7A975FE3D85D758C54FD237547FF5816D46A9E4
-6BE339A32316087C7A7248392C8F8EC2D6F3E65C9F6BC48A4A4FA660526A6060
-944E43538A977C94968E61B67735D6B9D9782950B53AA7285727B0FCAFDF971C
-4858BB002CDC644D4CCB2DC159EBDB6463B89101CDAD53E859EBDFE766B69B44
-8D51EBFAAFF141EE43367B2619CEABE1E9DF4262D5A5B92337009C13E8ABAAC1
-9350DE4CD0EF6309A8BB7F6E7846D73CFB02F1EB12E99D79F03FFA5B36CEF1F2
-3E2B38306DB5A76F1751EB37415182F40F523BC8373E9632DDC33A3845B6086C
-41EBDADCCF9470B9A1A88679B764D82076C95BF61AA5E528F1FEB2954197D787
-E04A8BD482BEED92658B5C3580A6C8CF71B595868C28507F74C4AB27AA73050F
-486B1F993002C707022951A73024B35D3C26129CB619B507577B90DF7A5E7B75
-AFE0E6F6982403D933863C32A326191A8CEDCFB195416FBEEA99D3773D2B6C47
-B1E99BB1A14514BD26F041E5D568AE5844558FC1C5B080C962D5D7BE9C836415
-B17059290C2404C78744582EEF247AD08B9EA98BAE5792511B0B0B2D33F0D37A
-F96633EB1DE8AC98F91DF932DDED7A2F0320E1B6435230C8D6541D1D3A02FFCD
-0916EA409A82FF79821365C7DBD28DDB39110C818F911E727EEE7B9EAC17AB85
-B1CF1EEC87BCB1F24646286CB6EF9356949ED5DA9C739D62C204556EA7B188AB
-E3C8FF2810F37F0650F94223C4C5B485E3E420F0F6D841F7B6421C735A676809
-003E6D283D46B9487E82B2809B3DFD7CD9936C49BFBB74AF4DFBC37DE98AFFDD
-E3815F5E4EEA8D2295EB84AB91522AD18FE2678DD9CE727EBA8B1474730FD83A
-6927E9C86737AB82D182E9F0D61467DFC393BD3E7D1B6A9D5A0C7E7D959D3AA6
-1032D599D0582A2C89212832C6F0BA4D2F9316E80D3A72025A19848C2EE2DDF6
-A46CB96754DD6278AE4F45B40608B5B10AE8CF0E540B39DFFBBC8A0BF42461DD
-5124AFB033C28C50E44029DC4365DC1D1509734C53F08258868624137187C94E
-4665973A0B63A3E9A84C6DE68BB93B63EEB14E67D089193205D01792BCE5BDF0
-FBE0A0B014B4803B9F40377004955165076E6C293968556CC64556EC5DFA5DE3
-268925E472C1970DBAC2932B59607780612E3E67F979E9E43E8205E94B130DBB
-2878D14C301A3CB6358559FE1ACBAD8DCC77C25BBBB53FF4363FC14A52EEC779
-4366F6F4FA2F411720469953DE4AEBAB2412EE03ADDFD883DC48B8A2E605AB55
-D9802B609A3F376AD9409DE3DA98910E662EB9EC3503C9F4D36F5639AADD67B3
-D33126389786CF1ABFB5DDD867C907DFB9EB86E852C109F5D74891C295A21DB1
-F239FA7504658B3960F98A4F749DB082D8640412C65E7F51C2D2114747EB3CF1
-87BD9B12730BB9EFDD4846E7627C4E51D9D95D8330F083721AF585C51796B885
-176476E3C46F4B4C4022093CE906E54F467864690F9FF4633E307B0AE4B4D3BA
-AA326A787AE941EA13F26AFBDB79DC3DE6C212FBDA727DDC0F67D72C6D9F03AA
-07329268F441F7B61230735CA8CDE44B9E0B0C4EDE1E7B3A8F24532F9B5B95B4
-FF6AD19614EB0F5846C3F39584F07395BDF0E94BDBA3E596943D4601767AC5FF
-37E8A17D3B8FBC8E3A528977340401CCCFA08C2E7C903AE04590716B2B87C777
-AC73621B0CEE8D52BAE71F9B21E8B6FF7D706B3F8611EE3DBCA777AC4DD1A732
-29492316AF4A6179CA9B40078FA6D29085C9FD62AF625845BE576A8AE7707CC0
-109E907CCC13C08A5818D5A1793EB14070D0F21DACCBFEDD1373B405CEB46BE1
-1D5F9650C0F66BB492F0B4303966A802421547922E347AE7B86078D700614732
-F3FBAFE78126A83AA0054F2FCBFD9BA0526D38D2B62A63183AEFBB12601CDB62
-7AEFC03821B866DE2EEF671E9BB731D34333CA08BD3B59ABD343F57D447FBA3E
-2E33939F289D74ACC66238E1670A9AFF90F36EA52B43BF83F3887DF04892347A
-A30E30E0439AD51CA05FE182548BAC9A4E4779842E107AF605DA87B9B8EC5D78
-80A8BBC24B7A3CB1A0FF6AC6CF91D1438FCFF493D16C767057A1527179E6516F
-2DA2F6F1EF7034B0B105989D2306690E731005702E16C267BAA850D9D9F47299
-71049E0713C1259E4452C67F4597929BD1F886EE2C401CAE4797DBBA90C6EE57
-61B51B33E1D3575B231CE23085742109B87E6267D6C72AE747100DEDE157E1E7
-6E88462A7B6EF995DC233FBDBC1AECD25C8320E8D6C7D9F0D92F0CC81BEBB8EC
-36E7D75DD3D914D8665C70AE06F959153B40F83362570423EED2346532C37EE4
-D84080D073BC484C694C9E6AF299409D5DA769D152ED7195DEE9EA5858F641B9
-B205E9C04B52183462F00ABF0860E598A169B0DBF10EC37AE2049EA3D7D646DB
-B6357102E2678F49A9828EEDB4E916F2E43A1420D8487C36611A9C173F501978
-063D5CB2BF0F32BA27284A5C2AAA6CCD4045199E1E658B3F8256A73D24FBFD85
-DCA2D990480AF3E10E463F32FAFD38D3EDDA08253115EF6AE4BB32AF9FDA5D89
-D8FDB4F30174DB0BE99A9EEDDC6102FECAE58D200A1F6839758EAB6FAB286A35
-24FCFB9E4119A186341CFB1AA8E3E68BF3AA81126A7DF90D0FA6D94A42165F8C
-F0EBE41A6528A38D30855606E5038BD8E414F8FADACFD56F1858BD6A32858601
-7AD53A43E30046E876CF2AE38B7D280A9CE82E0F36283EB997E12511E74E53F6
-46497DB76ACB11DCFF1014DE5BEABB6133D42B6866ED2CAB51089E2AF32BFA54
-8FAA2DCD12570443FCD3BDC6D53520404E753034519C81A3E84C3E122D4CC1A9
-0AA2AE164475BE0E2AD6661334764F71C20FEC887BD8EF2B7271A67FA2F7EB9F
-39255EEB4D22E5D7256DED2876CA7F7DF9CA683D412185E385437EDFDF32AE56
-3386A8DA8DB8A4CD28FB8076EA389AE2391E44BF680FAE50DF5E2EEAAAEAFE0A
-2813A3537D1AD9DDCF50F0EF1CC8F8CABD064949F7DE5218BD668A0B46999BB1
-9AA4AAFB14003647CDFD6EF5ADB142F14D1A604F7E99414FCE97D03C016DAF74
-2B7C96ABE807EC5FDC5BC5C6B0CDCE45381BB160ABF82633F4C4B1E7C0B95AC1
-2570EA999477C368E35BB4BA0AD6FA78D3942107095FD062D11B7F47E7A4CB7E
-F71F78BC09019DAAF0AFF6D80777EC6E0EBF2F3DCE3172A31E9E8B0E8DACA7BB
-04D5A74A7A854E6F38BE2FD18650F9E4E501F0ECD4C674EF110B5E03A723CD62
-BD6A5358809C15CDC64BE255F808AD2A9BFEC49CD4CA623943F9D50078D11D6C
-02F53F06905AB2BE3AFB8573FC804919E0EE4DCB39A498F35C5E3E94310F96B1
-8F190A1945C40D9AC30E4989EAEF8B4BB1CBB268FF2B28C1A77C92F2D29C78C5
-011191AAA5654639F0697807C78317A9408FA4D85B5B5386FF5D783A91D9202F
-D513BF1821A66A17A74FB8E90B43C59F73DF237F7522F402A1318C4451865DAA
-080162D25EB096A304B09FF6EB0F09A6759AB4016F34A84B9DBC034DD02A4AF6
-F20A3E1C9B59168843DCD4EA64FA10F2C451F1208BBC4B45150CC89090410289
-B7ACB44FE75ACBFDEE0097F82D37ABD2372CDC3559CAE8B6CB3A8CAF71B74574
-3AFAD713AD907BD89BE20D3890376550DABF8BD6E51017DB5FAA8A1AA52DAC77
-F76702320FA5C140B10E79BF83046010334476F8DE1DB73C290536312DAA72F7
-FDE1FFC42A8E20781E3A8A16C208878786250A2A5B0954E529BBBE321F440F8C
-BDF2B8EFA26F820DBC1D7C6F0844A379C61C3A67973E2F4253A1F1A0DFCFAD4D
-ACEDE777F2D2F7A733B3C4BBFE15A96C8D5ADCE25EF35156AB35544DB9AD54B6
-56E0FFE2322734D19C6ED66639946A5655D4AD9DF6BCF9D32438D63CEEF3B544
-E7D1FC006E8C4C3F2D155B13792823471BF6CB9B9C9B512A591D6BBD2DBA76A5
-BDA3A7FC8A9EB136AD0292B7A2D04B027F9895AF10705A7057302A95FD4FDC69
-5BD0ED514DDEE8A97443E951A14349B9684AB09A0216CA7EB282702007937C5F
-C3B4915B96C0735F911FFFA39DB14BFCE5A17B2D1F1F6FE2968EA102843A33C4
-1A7ED4ACFCD87501895B4C12F6FF094944ACDA44DC93F0101BE268FFDFA70393
-8403CAEB1B1B2F9F239D53F6C5A70960A982D2FFD0E9015BAC8C6E053E1FFB29
-AB077D7C9C30DDC155FF78D7983E522685DFD13A9798F89A254547D0EA504FE8
-DD1550B21E3C8334DDB53A02CA4D48A609AD53CA578EAF162A453176DFBF3D57
-D7A6A1AE1DA613DD527C875A9B507D65A69195472A36DE2F8BFC733C09C2D2E6
-0E95DC0DDE5183DAA9D884A8798CEF1B25F77F2142710DE7B71FA982355B9673
-70A7D562FB29845025DE74A799168EDC8C3FE6A833E4F1138F534C15749E6448
-A0F7AE66099CEF20748BCE485A83A4EEC159C8DADC40A4C224C18346967ED516
-DDA389645D0597B03E2E467338DD786580B7F92E5D4AC255A4B6F12369BE1FB2
-7F0334405838C68FF0150A4059B0C6F18FECC7E5739AAC9EE1D540A4599C2C81
-1F1ED8DCDC2085F52A2D9587EDD34089D289A05C01E31D77A04A784DC764FF7D
-5C7E8DD9DB7134F8CB8CE47391413F5D0E95D7FDF91A1C3D6D6A6377D9579857
-34A354911091A94ED990FB35ECDD21C3CCBE906FABAB6A8B86A55F2C22D9BCF0
-FA25B4200DFDD137447D344418740C7ECEC15E46A1E4117F05362A63C5894A93
-6090BE946598A7B75209AA4DB14E2B31021616D0CBE2AB0CC375A64D25DD775F
-3281803F22BB0E250316916B563A6255648CA76FCB18087B9B5D4A33135AD0A7
-55FF956E5992A758A1FCAC3511A660F947EAE0662B629AB08E4B6E6F50966B57
-1D008A6354ED03FCC0229B82C90E71132EAEDA24FFEA7A4A1C1C422D565231E3
-FE9BE4A9B67E3D3B0831F0CE66CE8EE2BFE7B05B16CE039B8D3289187A6C9C19
-310EFC5E36BC61F687DAAA15BFEFDBC9937241C42219CD3616A5D11228208CC8
-7D5A04AD6C137F45365AF1CDBAD223910BD35BD2EB58AE599692D289182E8366
-7B0969D391FA8209D950AE914E3C26F50676D14A201A7943854EDD7F52833E7F
-F56008284B979CEC35A117AFCF73F21E8C3591B38A540A0C4E8BD600D387A958
-8432E92AAA4B658651C5705B18F3F9E8FB440DDC598FB62B1FEA0094A55B4E45
-C53253484E7E91716700FD203DAF0FA1FC7A8F697A832BD25B063B730B9880BF
-55333A6CE01F971CC5F7868A56ADCC26A319C9BB6A34CDF5E3387FC96653449E
-E9722363DF0EE41B4D100FBF6D005EA0771D97F082C6EDE2BD31BFD64849832A
-EC79257182DABEAC97904055A36CDCD11C026236C919FB9BBBC657E12E012A16
-98F904876922AF7804B9129CF2E8B1DE8F7AF1318DFBFCC20D8DC0B1604ACBD1
-63617B77D65D423ECCE8F6BEFACDB7133CC76213C0CCB254551EC5656ABD621A
-93FEE100A012CE9760134D9D871BD38ACC4F3B3E50CE7B5DCCEE39982DCD39C2
-CAB8666DD40307F715DB7141EBEF90FF45C1568270892DA8E03F79D065067089
-A0100AF38CF7F85524EB9327D1B78219BA61C70B8A6E3055D5E09CDA43120DDD
-426201D85654CEDB93BF85EED01AD9608AA5FD4F91EB43E2BA60664D2B3CFF2D
-A641C65D559F045FC941E58159AD71A3EA6E5483E906ACBC70DD95CAF3E5AC0E
-7921BE5815AFE6F78B047B69B01EDD51BDE9E852337EEB911B60BDCB54CDBEE9
-EFF00404DAFBAB588BB2761DDAC94C969BF0ABDA7CB9384161F986EA6F86EB1A
-9796A0A60B69D92DDBAC1814E86EACD5FB6D70BFFA48734A112325C1A897E66E
-70C4948FCBEB0923B97E2BB3D7FDDB44CBD2E46A288D9C33E400B1AF6CA3E3CD
-BD4B895C63BEB7A0984388833E625269C99CD4FC0A790ED8BD50E7E64FE8209F
-213BD7DE9CF746B2CB1440EAF9CD52B42F144B0017205DB99874CD62A1201224
-A6D8A3CADDF6758764EA8D08BF2738665ED1EA4736EDE4F70D29CB5478EB9745
-5F72F059602D8B973915A7C1F786DCCB6057256197D5794AB9EA2FEC41F92373
-7AF822EC3FE0391CD4458C278E08C1B92F418619E7390034503C71ACAD5790A4
-F95E540442693624FC17FEE33307AEC932F59D55EBEA90EA77370AA8F4036F1F
-DEAA348233939F5607EF930D1492D31A8CD0151DCB3F2E5E9F3E62E1C35CF9F3
-5CE5CE88D17D4C36039AA6FCDC3889AB0112AABDB6CD26559BB8ADE544590F53
-347543911BD163518B55DD16A675565CF5D7D8FCFD3FE4F4BD5FE326BD8D582B
-84B706E20415743D0DF6AD4178462197A88C1E113B90E82875230FFC3D39815E
-541D394C7F082C8EF4D86D0A690F1E74C8D54A376C3995D0B3DCFDE691BC8842
-17598B64FDE8F8532F766B7C6A9B3D936216D3956B620507F47C18A5FE2A0A25
-D3BC9B76D241C6709E4877F9DDEA53717146AFE90ECACEC165897D8B62368913
-5A5537A585EF6A8A8FE7596CF2FC56D4FCE859643E2812ED117912BAF8525989
-CCFDBC9C202D88F6BA2845DFF2C1C1C9D9828F903A1E8CE2D951739BB8D026A5
-936720B633FAB3ED412C719A499C1047C6744CB0892425DD60AFD01BDADD8C7D
-A24C22FC651EF3BAF2B8F2B508D1F2766519D340C1D0355E7F1B35DBBA430894
-6CAF8A0C46F2FA9C717122B0337EC089B991F4C6A8A57CAB93CE582C78D45CE0
-4A2141D8F088B8FAE6346EA8ADB8E2490CB460292AE0EBE73447B9970705FF8A
-83B18986FF5B00FE98C28A090CA9326D2B50BC8CAC89359C4B7F903874E1565B
-380CFC3F7C0B54BADC8412987114A59F9150D97CBA104445F674E322693F54A2
-B9A0A8C6E372580349F62493707EEC78F2599944404B7B0B79A979C28CAA156C
-45671FB5B4F0460B13971D1CFA93D523E09977B2F9A3E312687B3BFA6DA70D7B
-AF2BC5ECE2C1B198297E770D56F2D294CCE9815E786B7812BA06DC7D6D23E570
-9062979D1E3CEE6C21EA9663977FAD359575B9FFCE754572251698C73D2F79DB
-E5829B25FD7977D644213D14B429F3794F213661F2D540CFDD8E485757694026
-0D69B3D22D9CDB0E7D6172EC63B0420817803DD790567258E34B481428336BB8
-8BFA0047BFFC49FE05B87FF208E0CE33921093F6584A826FC240B1C09BD5F86A
-B267E5081D8792F7B595A923E703F053C1379F4479EAFE8298CE6525E588CD80
-C2CE885D80A5FA021D82019BD818FD2B3A23BD832382909C04C816C7281A6C34
-F6E4CB1B8533911531E5A78BA298E6F2CFA64D8635BC8BA99BE306A2FE66F68D
-BE8367DA9CDD98220835DBC6AABB15EEC62319968B96989AD1803EA201601BA9
-63414EBE683208E5BAA9164DD4A185DF4DDD6F99441DADD217940B20CBD8405E
-14009AFBB533EBEE1A84A1CC16ACB7092B8A67802E7057E6E943CE6E928BE352
-1024C4E4EE397DEF71DE6E44FDA017315077ACBD4059377935789BFFDB8444B6
-560E8F1540F4D60638A1B6AC0E3EBD9F7300F14D37179C411309FFFD39A68730
-3EE12F67EAB031DC3A6C7481AB5B7E8EDCB96F2F1C815196CB981CD9E774C89E
-A5F5C6FE10406CEC405D7C9C636559B949E8EC26D42DCC883F4C98E8F1421D27
-E364F998698F5EF8153E9BDBFE859BFD0309F63FC38328AC14A974D380750414
-1E681F461DD52B50B47843EECE9B0D611D1417541EA6139091305BA7FBD8764F
-3B8165F1D5BEE6EA025C8CE694EC1013EC7DA9906D6FE6BF97BC5E5DF7BA4E33
-07DD612C811D1F5EF4154E8517C9A6D1ADC46D04C670733B2C23FCEA7522156E
-606E82C845394F756338384568830D74860E6F5DD9D2BFAE8C95BEACB5EB2C35
-151CBF5B4CEB8CFC307FE6B9688648C5D0FAC55A6E44BB517A2A46C308B15A58
-DB52D07D265C7C3E543008979A1C2B658D0FC9A088BC621561E6B322A2E3B359
-ED857F6E0865F7F174EBDE802A3E06D80034921111DDA60783D93F3D614565D4
-27CCD0DA4972CAA82B3BAF2492765568DF45E747C960CA867B2E61628FA5C021
-6748129E8EA2E2C0E9C5178533B46ED0C393645BD2A7E6A8D60F51DFCDDA6EBC
-C6E808C26B9F11A2703F22C147175154CDBE30E4846980EC5C122E5C62E41C5A
-37A6A184F781387785659D5749B03DFEE967A577C3029DA91CDD158284395277
-753F54F06B9F0575B401A1E45CAE9D7CBDD92563CBDA134FBD216D3ECEB60359
-676B3D5E37F6B17ACE851965E554349F4D724F0D03DFE331519283579B2C564F
-6AD4B474718963EB8518DC88DF321590964525BDDB65D09D387A6859BB4B5754
-D6AD19A3D5CBFB3ABF8FA0A6B188786814127E692F78AEF3018B399D402AE7DB
-2B5F5DF76EC7B0BFD28142BFC5658A0F18579FA9E2976F685A4FEA2FFED40032
-E5385748A6AB1B4B78F117B96D7FF4F776A87F5EB2D258C0C5C8FF044C5D51EE
-944BD226D4263EEA7DFAF3BE09E104E15E8F50FD61EFD84E2F7BE36AFC600D90
-AA4AB24C8D70D7DD605CF2D6CAC857EF9039E0E40D94FC1EA50094338BB87DDA
-95EE2C2CB3EE5241C75A3E484F89E43ED060DBE2C40BC1316BC6EEB5C03D87CD
-0D47132C98C92112710CC7E4C777AD410D4FE76E8C19205BF20DCDDF2638DE42
-7873EFE74BD32E6F175E2041EA03E2F4883F2FC1150C71BBBE6ABA94387BC6A7
-A1493EA767EEC302D5FA50C4F9AA8DE190836B04F5A5A1C15373DA2417F560AA
-D8F7A0F321E2AF047D326D9E8235BA1EEC1B49E10222B18281C85D674A07B0FC
-1EC0418A953C5ECD1140F15A6CC35994BD493853D06D6B24303BEEFB9B13358C
-49F992C7BAD1CA1B67D1E455A4D8FEF844FF846625D4B998C7A49EFC9BA7B9CF
-C0F091D72980787CCACC9A300CC8C57A473B513D0547FD7753572D062A4F3306
-5C6855B4119BDD6B39E62FFA97EDD64670B853F37DBC2067EC814CC8EAF00E82
-A18E979900E45B554F6167ECC9FB3ABAD8AED202BDBC66750C0E1A7B078B3884
-F6EBC2F9C6B78BB2E238C84CE373C46F6B8D65DCB198028942FE2DEA69DF8236
-B7A0D87D4A147C8F6CAF3FF7C69B5883AD5ED8C90B5F8881BDD5C8B919F85B14
-ACC7F679B5E0663DE8B2FDAADC9C7C58A544F9B7B02C4AF59DE093BE7325B646
-D3235BC74A261844D5693B5B4D51E4F77D6F54DCBE33B54E85858C66967652BD
-943BDBF66C0D6F1E120F630EC8D94DB19D986464CF1216850D9A2805A7B0A3BD
-AD4296CEC91CE68FA4C154F2787DF155909FD15CD543C9E77FECB880DC544F69
-02887B4732C0DFF4F888CA1841FA3BE110DF05375A73B359AA659C0A03155636
-10FE6C3304E8FA02762E70BDD5A0248929CD231FA6F6DBF66EED768D77B63FA5
-EBCBC8635DCF6B1D57E13FFE99DEBD32B4F79A0245F7CFFE269A9019005B3147
-95B74CF2961F9A3134794C9DA6D1038DE6B43480FB5EE2544529C26ED6D62B24
-4FAF3CB42599EEDBC5B3019F45B91AEF08090DC5F5C74C085E02E341AD46C463
-BEF42E1508FD510807529017A115D3F7DFF7BDA21C9212688E3157241E5675EA
-37BA5FECC46CC6CAE184B57FF286283A4A8816304D4D372D68B5C88A1927266A
-C2D70049EA6B3ECFF6A9570EE528D5DAD8DE7FAE0570A198165D6103ABD39931
-4AE1462B55AE6781011A7F8DD8C009350DF5A0B1F1F8416FDD6FBE4C4CCC091A
-D43E75946819F8F8F6979CEB210E41CD54E49CC3D05EEAD310D5497F6B79F694
-C12E2294B0FC893AC816C50817B81EEDEF8A16CC709242C8DB9FCEBFB0092E7C
-C538FD53EEADFA0A7599C2FD99C7ED08E6DC49562502D9F906C7334F8CDD2106
-0D35F24B66D6EA6E9A9448041CA120B5BBD8541D72B9E4FB6B098A6974BF3AFB
-78928BC794C012540C98EAC425179A193AFD7293BC86B961BD9462105BC864CE
-15BF8CD37D9B695DAE2AD24C779823B3B68CB259F0DBBA44091627F82A2107ED
-318919D17A6691E51A64CD6A4724202B676BEF8AC977C3D98F22E80F8F2A44AD
-2A69E71605A02036FA8CC986D7978D5385EB3E98013BFAF63A4FD761EE98BDE0
-07F27329ED943F2612F7CB94A0D0218F3735DAAE8FDAD87E1DCC3CDA3AD6350E
-BC037FFE4E5C435BBBB77BB00E9A42DF896943603FCB1F5029F7896994AF242E
-4F815C06D0429017BDB5C63EF2880E068D61F2B88A0B988C95C23E250FAB1A65
-B10806DB00191FA15D133E43AC34CCDF00093EBC7666B6C313D91E792C2F57F8
-E5E3DF6D0AB7F073F2125CCA53E95B0432ED1D2D1E7D8E9E31A9F31E61867385
-CCC3EABC2E11AA696B307C0F917BEB0792EF74A8EDC509992BB43647973FE7E8
-EC1149BD86C9DE3F669EC1E43EE7F6550079955C6F050BFCF9BAAB9E7E886635
-BB25D2A1F860F99494554390A481B2FAB03F71564EF9483CF38C1F6ECCDB714B
-8C7203ECC022D039ECA0E56DCC537CEDF368A8A589519566F2CF2EE2D2813671
-92AC38361E21F854ADE2B3C9339C7F2D5D5F1D4EC0051F70FA03DD920776126E
-CE12840EE7E96F7C530602B5B8758C87D68C6556A313F6633C69F00DE7B605CD
-2D29851B1DFF7B1977BFCAC4AF623DA5F51C801F28FF85B65AA64D0A0F0FCD32
-2693F94BD5B0C148358155098914090C94E75BF46534F22A0A879A6E0FB14291
-6EB455639AB72C00B2748BF2934AA97CFBE378C0EA28694A1F17110415FB578D
-42458CA22E8CB9BAD86DC43503650971AA39EB97A6DF077449CCC2E54301ACB0
-3240C471B5F320965C5833822130BB667821A43528A4722E9ED04606324C1A57
-E233C21AB0545A4870EB8BD3975ABDE7082BD80EF4E68C091050DAB6DB518E52
-7024D7882EB6EB1D995CC1D43CC2A8C9BBB207D833D4AA8A26978E30D10F40F2
-7217A3DC389C4E4502F242872B2A0EAE2EF5B837AB2374CAF3D149C28E917935
-F900BCB267F265A4E0DDCFFC231A5483AB4716AF2F161714DFB69589777AAD8A
-E5FFD07CDB692AB573379B1C2BDFB23580C36AE9665A682B3E70A0BD79B271CE
-5EF9EC4396FB40835264156CBE6E45181D681F68882673E4226C6B8071F790AA
-B877DDBCD883B765526C0DB03090391D0541318D849C05B43B0024BF4E4D11A3
-B4EF5BB7493CAA62376514740EA9B262DF772D45540E911E023E9DE938422898
-0FE79303FA08B26C706B7182E0ECECA6F1A5F28A3BDCC009AA087430E1CAD0C5
-CCA7AA0C8C69E446C5E9E947547AF94E4E92CC4FD0B8BDB826155ABFD0D6524C
-5DEE8878906BE4B099EB919A1D92B1C28891E7E087164FC30DEFA88A0633B814
-D930BB66850360DE1EDD37514032F3FBAB92F4A9451EA11D2BF0761E13A5BA19
-D270E129C114CF11E3F7ECF0DA3B4FC19AC48283426DCDEF6C2D28B23B18083C
-0AB82A8E1C8999F6509CB4B5D5D35511A5C1709C10AC3342C409728BEEBBC460
-F15933CEF659613B4FF9F233E0DA75BE2AB01B3054F3C9BFCEDF6D41356C45EC
-5B4066A584FF5B17E2949D527990C138C1F04497C2BF64BA6446D5BF743DE7F6
-4CCB65987E1C20EF9F5BC4A756A5FB016AC1C16EA8067A159FF477531712CA53
-7EF27C0F787BA056116AF83D4A814C15985CA25AA8953D7C789983AEB0B8D1C2
-699A1C86D56C35889B7448D5E375AFA2D63A122AB374EC2F09C547E2499F82CB
-0863CA1DEEE53FEA5A7EC6709615C2108B3D054CE68034C2A6D708A293DE05F3
-5F21D5ADFC6174D10CD5F096CFEA22775D900069B5DBF57DD6C9020D2B2F4717
-A30A1A61329DDF2702FDFE076E8A829F3AC56AA8919110929BA9D7AA624B0F38
-DA38F9D60A06AE7022A3333F152B0F95536F23C110900CF816B1D50F4DEA8081
-7F0584BA7971FC760DFF6B0C53A633B5548AAB20EF4FB76F9F28748902E0150B
-15977EAEC2C3F420D0FB6099FA9323331CFB1AA87717F1937E11F51844C7CFF9
-CEAC489ABA9675F5F3B9C1493AD1584318B525F8729BF5A75CC740BCC8AFE654
-8467F1215E49EAA00EC86276E5EE27F1A31F0164FD638129B7AD090D5F1B4AF7
-9CED5A9E01AF160394A46573B762BC519E0381DCF47B7DA629D93C16425463AF
-DDFC846DDA7598B052AB49A5028CB45B53A97E58D41FF2432A2B90961AAC898E
-1EC35E0FA39B9C9A1D143BA01D7D0DDC12486083D63DB4BEBB436ADA07160EB8
-159DE52CACA71A5038C75C21261D2C8114A2D7D0DAA90A78BEA38FD84EDFF90F
-BCADD4E255B966DB2921A91DAC9FF182D68984C3CB2D6E6D8EA17C952E76689E
-15BA0AC4784C1265F2D5E1C853972821354ED4AF87297541C8D173328A525BDD
-021509A8EEF039147DFE3DC0A791E0D3455CBDD171190EF2B0E7DEC2F27D8338
-894B268A8C63765C595EB4F94B50CAACB363C9B90560D4FC58B6755640D56BB0
-DA9A012FAA533533A8B61FA50AD2F0DBA6620A2A134EC9DBEC4065CD137700EF
-893AA235E1EA0B2B5B3D0AFEC15249E9FE986CD9D4072082F3A7EBD9537B34B5
-261BEA38922F75D6450580110EA6EDAED269F4CD60146C464AF992111236F25A
-7D6DA6DE13FC1CB9C9B08D902ACD8AEF10BF9D973E8BE85632FCDC5659BCB61E
-A8737E15D4202AF42CC32C491CDE2B427018A2BBA26A2C45A0F04352CF0B3155
-23867AB76CAD6E53F54BAB7DDEAAAD55546EA51A95577ADCFDDC4A58479952D1
-9F81B21259FD46E4C6BBF7A072A4069B75E13F0102CC6B4B8646BF9D7732C91B
-233C05C4EE16860D79BB42219DDBD23908972312AB03D983571659B463CB46D7
-27A6621D519E3F40873073022681554FF98A94D4DEA5549706E7B600E2FE7DD3
-4459EDA02F49FACB9646930CCAA606F4FF8D3B5789972B002720C95A2D5CEE2F
-45485846D5A67E9187C31473E23A91DE40428A105067129E6446B95CAE1FB11F
-0A54A9CEA0561550EBA70D9A44A04E343F00CF94FE622C081287AD00D2E8241A
-799ADAFCBA0293A7E3AEA2007E8B62BB2B827B62CAB8CB0EC5569B2DB12CD196
-95D7A7FEB41FBFAA27D7B8976B201319A4CAA8F84A4D929A12C1C5D7D0C18917
-D607E588656BB3AD6D26D2BA11DCC78243F0216B2D085F23A3599B2D53386700
-11A7DAF4905EA41B92D984A86D4CB723B3506FE1734E7899FAC520ED33A28158
-AF7A3B99CF8192BD991F8911FC331C81B939FE798C7F002A6E40AE7078A95BDB
-FACC554CEB9A3EAB48D2982AC6D77EDF092FEF3BB8A345D4C31821E9F1256189
-BF1382EF65A786679CFB5ABBB5DBA25B73A8B3C76F8827FBFCDF4F069C9E473D
-E8CF8AB7FBA03FA8BEA26BEBE95BBFF7EE492FED29DE87F14739C514452AFEF9
-5753F94E4381611CD41A199C054097A39069AE5760000FB82BBDC79835F6A043
-C7526B5BCF7AF7545F473ACC165EF655F727051CD6C6C0B29CAE7D8530D4601B
-C0E60666979449BF6C6569A6CF07310AA50B8EAAAA737EB43FE9405D7A38EF46
-7C870B1642FB03A5B8C4C1A2602430B8121C9AED3237FB2974ED556CABC84C95
-7FA4ACCE1DBEBC4BE3ED2D84B5CEA691A4A86F49BE122DC7D5ECD64755438C3F
-B63E9A5F665DC054F07A295CA75750164CA685947A2F28A8BCC6313A6ED75C1D
-24E60A2553E618FF5465628A07C98C4A2467D01B541CFECFBCB75E93B814DA4C
-75991244E63C1C7EB591FC6D359BF6F2441A7D0F54599408F38754A1CC3D9F1A
-4322044F33EC757B52F0106177F0F23BCE64E31685AF97354CC36262019E3476
-B1EF9A23349BDA7A0D40A2BF87EA87FF6E81832C56001493187415AC3EDD5866
-A57291B18B39E76363A4E5E257A35D40BCB27417EC261F7FC291A8D6487481EC
-990A434FC53C17836585F6A9D0BA3560B03AD8C992268C3BFD216EFEEA627A6C
-E24B848135D68881A996560BE0074056810896610148F4BF13E2B80090318249
-3BBA16E93050BC1296234E2C0357B669B3CF930F32F813655B8D03F409DEB009
-9129EFC2FD637B8258FC293CECC4D7C7375A7ACE08E5145D51851ABF7A52B3D1
-5468A0A94B2FE8ADF68891F1B4C9133596D02846F6DE8D407F18665E6C8D4FE9
-32F197A0A15F70138388B33AD5E6A3517B8E1F3987FCE1B042E9A1EE908E06C4
-661944B856AD10C675F1360599EB9944A0EF679771C6326D165EB73DF430289F
-B00E5ACFE7C21733BDE367140A03532A10D271133D227B0A6C3A8355DD660C7D
-E6FB054D5C2A7E4A560A0EE40868FE793D27B0BAF57CD3E3879B8A6C79FE24B7
-2B80A8DBB01865237DAE898315CEE46A6B9F75B1EB9C13A18DAEA267D2D0BCEB
-FF371F994BAFB16A9EFC4A085DD627628FF636C1FB297B120CDA157C76215C21
-DC2E84527128624ACAE5653D54A26F1750A2379BDFBDEA0E9538A6DAE6EB0178
-018466DB240C8087EBF064D5A965CF29595BD5A8A00DC94A62D1038DB8FD8564
-12EFE0C12ECFCDFC701E4AC529026DACAFCC13B34B86F0674BC1A3A222556396
-7115894B5493450991FFA9415CC9728B291AA864A247BB25B13BBE6608AC17C8
-C32337397279F2A5006D8D6706AE3543A9003139A00BF6CDA8E6F47F4AF7E408
-833553A532812C0942746433D471B49C180B5CA3308B03E40CBB2214E4588E12
-39D377C60855563C6866D547E713A92EF72B48F0E43559C339A6E8441055FE2F
-F591A28B7C0E1C069B9F9A97D64F85AB7F422BD776FACDFD31ACE6F1E8B1295C
-D3DA706CAE5892E9C28D181385A8DEEA875AE819DCE128EF0EA527B3222B46B3
-E57B2D609823AFA49E43EED3C6A020F738731515C4FC62C42F16A9280870B95B
-AE5DC1F680E6D075C2ADC885773DD9B5E82677A46B5CEF2E0D4C03A321C96B32
-D992E914CDEE573B1CFFE98979C9B5EAA328B5EB1AAFBEA5F5209F7A83B6CA80
-087E824D1AB3713754D4EC765C0C623B98752E1F536B2BCF82346B956F55704E
-BD3FBDE0CA044B82C503D49FCD4062032E133A03DB0F1CA80EC1CCA065626473
-42D7714172F78B674A1A2FE0E8E9B59E2ADD8103447074EC1EAE57304FD5004A
-41CB4F458C94BCA7DC6EA2CF8A1DF50B568A8983D858523953F9EA9D7066AD4E
-54B817D0D677F19A8C689E45A11861E6E57261FE6443E04D616815B238C540F8
-FCF9704727EEF043C756A23822063B431332B0111FF23BB092357DFA5DDF16EE
-569259AFB5A97A32CE7F64649BE083244677C9E67F6F58EE35FDFE0770F1CBC5
-9AF0A6E383F97CFCEAE634F1F770E20899B68CBB0E84909F10E6AB20AD629B8C
-DB3B36D53CEDF0D75FF6A8861D1804686C70EF95949E4B1F89B9D749FEAD878D
-CD1076B5D2A5E0C13FF6091D64837C745817CA28E72273A9AF45059EC4B2187E
-3E5AF4654283920CD8191503E232CE93648185343BDFA7C76758639775B8E3FB
-C1BE8F2E260434DF28B7F23D694364024F92586FEAFF2AF047F983EF4A455ECF
-930727B44E0A07EE0942C47D90DDF5573EF77D36622682F728CC9C318F5FB0DA
-550DF4E3FE6C566DE91910FBFB7FFBBF78E6EE37345196875A3706D05440CAF2
-074DAF626748053A51101B499AC82577C38F3C55A5DF192C32EE011BAD68CBDB
-6571CF2A93C77CE392CDE3A0E93D890670B1B0272C619E6A2C21F3F3D4DC3CCB
-DDECC187750C798B5DBD31CF98D22DC5F1C6DF4689C3BABF5DA280C2C237E497
-C4CE6D19C2FACE2FB850D00D10DE53F83F62958C8230C205B14615B9FADD984F
-27AD672FA6C9427435D7D06BDCEBDED922D68614EF8BAFF8DC2932DDBB65431B
-AB752564280289D1DECA67CF6155D768CEF28EB6DDF2C229901041722A0513DB
-83632B5ABCF9F440C3E32EF365412B509BA54EB538A5A26374DF00301B8A75A0
-950BCE4D780CDE769503A5D8B8555EAC7D6217B2DE3D4FD234996D4DBE8E3F2D
-A2F1A776A723E07319733165F9AE94E798A1DB6EC9E44D1AB2A79192EC03650A
-5C697A6E5FD0ADBD14877ECD01B39360F9DDB768507DA2DF800342B9E5E56D88
-EB007AEE61B8403183BBA21D3B530E8F7AC8B9EF2B15FF13A4D2865EFC5983C2
-2F46B2786FFE54927511655AF37BEB2428FC6F61826C7C96F6F7A06D21A92DF5
-0153C14E14110095FAC7ADDE01FD05DA0F0329462D257D317BD727A79F76CFDE
-32121CEC3C7ED88F3A382164E0102A87BF52ECEC7F32A6A7AFCFEDB62D976755
-4791B0CB6A3EE86561E0F1CD6BD53E98FDFBFAD3110FFD4459C787EE8B5F7B88
-ED8A03B769EA530CD6B73D3D72DD04443629AF93DD4F2BEBA37A5873F70B9AE6
-CBE03E60A6668BB9953FBAAFD8EB663BE5BD4C1FD21624B75589E4B6EB69128E
-560E65150C6D1603097AD0122A05960C9FB80C3043F43E70D6DD772EDEAEDF89
-BD895CF65CEF5068E717611129208909B1597C8D6AB392D181D4775319A80CCC
-E3EBB841BA61F5FE90E9F0BEA8BDB0802A32C3600A4D81F82F434ED577D0F5F4
-7106F104A4BF675C3F29D4677679610367CE4EB4962DDAAF34C1C1B8D4EAC9FD
-4CF7CD1EC456A274647930E61CA8631B774730AB1B05AFA40DB774F03B47672A
-382136D301953FB9524065A9B04885EA4378CE942D14EBD98C2E22D858D5CA30
-74E4FDB73552571D56000EB14777FD7D4D4CBDE5BC1FB3E8F0DF1FEB09D689D7
-A1FE918E814A200FFD1DB572F9CA81D2A44AB6E949A14EB60996D6F35D16838F
-7DAF61336EDB7E5DFCAD6E0BAF8FA004CE56B5FCDF355AB4746F0788BD6EC326
-64D044295E4812E91CB9F50407B61AA86D6CA2656854239C6665D98AF27856F1
-69FC627591323CA7B36653712BD7B63348EAC9049ED1F1E511FFF5C9580B3E2E
-7A5FF1B5694232569216567155154AD3030A2BE940F1C541BCA62E5366A9BB4F
-D86BBCF8F2968868126430B2BAA8096D5D15D99CCEFFC24695F92690FC2E02F3
-C72F91FE5A7BB6D40702640C793B34018632B42602C7E7615581C53C8C57CCF0
-8CB709F40562DA786DA14CA697E7977A060830BE729498CCE79FF1654242E3BA
-C76B44BA44B66A846F72D608463F9DC9A08E30FAA2B3B5DF5C47837374C2741D
-9AF98CA2D6BAF878198E2392B1B63646393A214DDAC0CB6531BBADE768260E49
-F4BB5BDFD72CF231995D772337305CA8D261BE57692E244C0E7A0CE56424C532
-C76F4823178B71F7490D50CB35C742980A7ABDDB1231F72AEBF1B92EC67EC422
-7DE6BEA6E5EAB5D38FE09883E39712D02BB7E5D587DE6F4DAE11F247DDB57070
-60178105C278039076BAE300D1B6FDFEF4412F8D6DC8DF39C4E969F8A173487D
-F644CC7D3E580D4770613039506507863C1EC7346A0D03A661BFF3FCE9D3C4E8
-B26C4AB8D9EE092CD1C0F8069E82BBC376BB9B2E55BA7128973BFFE6EC338C06
-2567033F263A93FF5A9AAC5A1025AAAE1EC0ED91632832683BA3F8F1E0D315BE
-5C3BE1C67CD4F84ECC6EA7F95F1E3F3A52AA51265F3E8DBAAC8127CC18C1C11B
-9F30D95805F328E7823E813F7BE2B243AD6BC607955DFF38A45647DE5980BDF5
-7CB889914B0B47907F08AF08FD95986F0C754851DA0A82B77210012EA35BC0A3
-14A39BE00ADC5ADE5F8D0EE1112BC33AEBAAA8D1C34E1114BB734038E34C9DB6
-2648DBB6357102E2678F49A9828EEDB4E2B5FB644C3719BCE7A46A6B1906D47C
-257CCD8FE3C200741CC02E1468636CABA978DCB64752F71241F6446DD92A1105
-933646F632E07CC0EA72143F5F82A1A3D214AE275086823AA74F0471B6D69B9A
-1B63AC5634E98884E125B9014610BA9F3CB67EBC2E6788126BBA513DB848EB8A
-95703BCF515F36CFD6F9E109CBADB2525E5435E5A6FA4C97C9154BDD47FC9493
-CF67C524702A851BA45C4BF4B8128C9F67C2052F37A31831EC9C680590BF576A
-4AF9D264B7CFFD26BD472F06308826728D3482FAD1DAEE7C7685D77458C7D78C
-9CF75F1A1BCEB919F48A5EC283D22352DEE39DA54CEDD266C3CD4D31ACE2B562
-CD3A620BD8CBC5329D97AFDB3E66189B9E36F1715E22BADCA9D13C11D38C1921
-3D665D0B5BA11511BA9CAFD3ACCB5E5E19A45F49A8CDF6D24C88EF3E11F3B4EB
-349737AA8C8AE9FE413A04D2CA895309C65CE071E625D44BBE7C7E02008C8E78
-D245B1A006319E6C4D9071E763A6D1E71520E0ED9CDA00CE5985B754CA38C6BF
-ABD3FCFF3E61833B6ED678C8D1FE0FA2402F8A7548A0F87CAA5549F5A4265BFF
-36301C9D89D9EF7E2F39CA2FB5D4A370D22E2E00B544890F4DB89FEA84C466F0
-BDF6AAFC42D93376454F1985FF992895772FC29132DE6676FD95641AC100752A
-31EBE517DB61E1D3039E500F5726124BDCC670BD901614682E0D743A82E7D19C
-BF609C323A0BA3BFE6E729430307EFD1994446295C076879B63866E552F0F225
-178BEE68D832FA9310B262738C3B1AF9F74131749538C7805F022D7A58792F43
-E1376A0B12B4A0B4725D440897927250E744D817E2B8E2106FFF649F753094D3
-46482607441E52B099D08B534992629646C228EA9EAAD051610BE21EE92FA7DD
-B629A34733ECDFE98953DDCA6F6BBD44761813958267F5676D66C0661EB4A9BB
-38C298B2D25A8A306BAFC22E13D70E9E490381406A6A0AE7190E88EC9EE9AD3F
-2C217744E547BE20A48FB5F9332DE28A27F92472AF1A54FE8F681512C28FF0C3
-D9644250CAB98E4F74DE422010BA6186C7E8251D2D38483DF24C1A2DA9C76593
-2086953984C5F9BE47E398C00E2DE650DE7BE2BEC59D6785800C2AAE476FAFBB
-C1293D25DA35A6259AE5B4E78D50991F9B45BAF0ABC51FCBA6005E737A777882
-C3A6D4F8BBEA8FA43A98760A584F0F19C7AB91209866A2DF316CBE4C5F6E2176
-0EE8CDB2433060A700AAFF7C1EF56AFF93D285E9A5E14A0B8181AA1745AED616
-B048135CA9CF45ABB3951B0166465BBB66DA36A56EF9FF5FE98CAF3E801A7F64
-CE14338943767EC89060359BCE5A4690852253975D7915F3E0952134DD6475C2
-8E7E3DD0B2409D6629BCEC3BE789C56CF79853DC1A61C48317ACD72DA2BF34C8
-1B7F2A85577FD61C7B1A017A9BC0C1F47385CC339F73B2241E58AA1C2FD38C88
-D047F8A95C9DC16D018DE4AA3D9A44EF59E529C025118B542888BC497B767614
-6467B05F8FDC46F8C49F738CE8E686759EA4C87DC66D11ACD5B5AAD0FC7872F4
-8FED658505C3547D6D62AE05BF0C17BD9301866B0E947815CA48217EF03C9A8B
-91B9057A70EFB8642319BE02A2F59F2B7222B33970019592FC2CB6141D657C42
-AAC219BBF030B00633795273BEF944BCA8D3C9C560604F6D80D2831F91D29A5B
-2FB69BCD78F3DE7516C7C42385048A738747EB936FA92CFB8D5E7339D0AF16E9
-ED6DF45D1FEDB26731D14016E0DF27ABED7158E2CADBAB7CFEDCEDAFFF1D7BAB
-B751E5575A083E1B1EC95AEA27FAEA6ED7E10C3F5F0E14226345B12F46B0C27D
-A442F562597F53C44FE45D74F8B756F9BF64F1FFE56AF2362A5061388B92A6E3
-93D35E45FFD0726F542EE02E1853473BB1241421A1547CE8DE865BD36C91B345
-53FA52C009DFA61A3E4DD48302D7E683BF12201E1B1038EC8D7CED573FD57E8E
-BEF4ED0B403E60EBDFE9ADA568512DE96AA1571393D4CDF2B40D04DE8B32CA13
-87AC2CACF43D7122A7326EB51EF1326EDA521925BD4FD08CA710161CA661AB65
-CD62C2FCB8F10C36AE0F9B6B6B91DEFDD23A86E6541A3DB6AEBF5471381422A7
-47C5190A77B1AC66D2B928D0601739845B78F0007B8526F290F5E991DEFE3DD4
-2659633E64853844E903325D527AA087A30861991093A1BDAAFDFF5A7C8B85D0
-BB87589E8D20D71EFFAC02A91AD60FFEF0AFEE25C1A74933C0C3F6F96B20F14F
-EC84DA9FD024FC5C21DCC84EB946AB4F026D595B21D407E159E0FAEAD1708AEE
-42C5127F6800542AD54BB5AD7922BF5BB09B4374201DBF5848EAC03D8DFA1782
-82D911F772C4E66F7F9B8A3149BF7F3E93E768EED54CD1B901D961881B6BDE55
-C6640ABCA77CEAFC1ECEE17BE945EAAE5A65B22E68200202BF126C35FB522B0D
-75F7809F3C777C61BEEC468CDED769F521571C6A90094CBAAEF8A2F62C1B30E2
-57E0FC19562D5C0EF6AF509DC385235B0B385EF20C2408E39D3D0C60E56AE4C3
-63C35198132570951103FFEADBC6D886500F28BE378FCC3A8318A93BC21F7BAB
-B751E5575A083E1B1EC95AEA27F936AE8283306D13AB70D2E2CE7BBCBB707F74
-1E16C68A2F08FF9E3EFE930AC07EF8E06E1EB0AECCFCE97230A76C3229AB9712
-618BAE91ECFD67C4736B0FF2EBAD5EACDD53987B43D32393F164F52E157BE9B0
-17AD5C5E6A9DB5B2B562AC113019405B9CB4C946FDBBA95FE7561A0F6C6FC08D
-06E40C508685186420ABE61F510C22B6B5399326C2B7DE4C7ECA54E95EA45ECB
-AD1E993050B8FCCB457D18190AEEAE4AD2A892E8AC1E90BFA99D34B3F0C8587F
-88FBF9D9FD45259E13F436A2A27845584168BC2A430D06DEEF720C2A4B7775DD
-8180B8F67DFE48BF6D57D1B9E2FA148D62DF24597B0E0ACDF4549F41B90C5FD4
-01D13976B458A7E9FD538C4204709AAD1F75E4D5A1502CC2CC543AC0256DDBDB
-5089BA3FD9A9AF7C7859A6D7316E7F3AAFB1F6E5152BA2DB39D6C3E8B60ACD52
-00D73F13DD53248456F5FE7580E909415AFD0F4D62BD0829DB4D1E7A70393F39
-60A8E49BD7AE2C4244979EB14BA8FFB8750F3C0B15BC34C21954FBECE4294E49
-F4B9985E304525252397B8C516A5074C31FFEC8DF303C02BCBE567071E250332
-9FA299DD94B3166DDC73E4D69A045A365DD3742E9A9B3EF969FBB1A1C89CD24F
-B498E67FE4A9DEE1596B6CE165C9B7AFE20F344EFC8217D74CE9504531A6AA0D
-4C54C358E25AAB98F555FE41A893408105F86983284256E7756C4225673D893C
-04FE2FBB81024DA99E7651145F9F6A7917586CD4272637F2EFFB9A370FC5F685
-A8D52C7F290358AA9CD9E5A311B539ED10EDE77EEDCF560F52A92D0E01A054DA
-0FFF4EDCDFCAE93B9876A2A536E40834E3033FE22F2496AFF7EA72EA1F8C5CED
-D3BD22FC0D05F643C0BE6B4EA705F7F72FE94A5D2361B7C7880568C75286B8E5
-432A57197DFFAF472BA2F075BFF945955888D5394A4E220D4D0728FF95FB8515
-B293590B96F399693567B7223CF6D2B765E13449133EF6E94BB6C1DF9165F034
-13A9334659FB1B848AB8AF7AB51D2EC0C209AB2F31A131A36CA0FA480C85A7CF
-F5E2C1D183E6492E434EAE1BA0936E19DA29AA77C08192EDCCA27AFB43FC96F2
-72D6CFE0F901FEAE217E4421D35B88BA2B4D3F6F088D0F9C391246268801A724
-28BC41869EE445C59D2E7F060E236F64E78BBFC912ED6BA4E8450EB4CD29EA16
-466250AF1955A7D8410598244D3D1B5A62907162B395AFF7D2F1551CB919E461
-71281F6615E9F77B8CA0DC0E20B1749EBBA97830506DE264B09359B8FF5E9064
-0C827C099C1AF8DEE7C73D21C577F5F78DE375BB7C0114ADD885B7054999E507
-8A8DF072F6743A4A36CC8EF06577BFFDDD06959CA7D6DE7EE2E57E1EF7679465
-62D76B38A71CCA202C629955EFC693152FE8233BBC3C6D4C990C040338A47C3D
-5716C5FFC37C0BCC9D526C04C0E9B11D392B955915E160B6EA71FF8434677237
-C694DE103FD053880598442C19E74AF0306FF73C6348C6C0104FAAB95F43A934
-D7CFB6ACB5AA86203987018C30EDF9198DA3B295A52FEBA91F23C6A080503F95
-1267C814DA30660F5CBB05691126CBA8DCB4B2B8E745D05D92A5E89E143E6348
-1013B1B34382A9944207CFBB5178A2320DBFD2CAEC9B48E523BB9EF1768967EF
-92BCDD01EDC7396510649E1B2937368D65BB5406668651177CB853BE259666CE
-FE37424C1879C263F53833C574289E8CF6B6425373644C10714EEFDD6ABE83B0
-5B49897FF9750541B1C0E5EFFCA669C4F79E40DFA180E2035E5D135A65E21D49
-EA8DF28250FD321BE28AE3866F391864DF9B406DA10FF25100E4A7B55D10A241
-B70626C45A3FA81265C589F9566A0DE3D63C52431A65E478F6C60B6F0C6AB5F5
-90023B275307AF550F3C8C13E73BE444E65664EC42611931FEBB48E1D944D55E
-5257B796091ADB5E11304823F59C0FEB78C3D60680790EA9A57DDBDA18159F64
-A0207F43EE94536CDADC68BD81E5F16BE5F1CAC4FC71AE40DD936C862424A0BA
-C81570931316A6FD605E5D024B220DAA367F548020D1E44597BA2B8136F6B4C3
-9D72FB257822D94CD38DD33F020621C739A23460E15A24E346EBA615C4745640
-D56BB0DA9A012FAA533533A8B069923F9BC6C15C2B90F2B875C69FEDB4D616FC
-08A3EDA1387100AB99012F5925C5DC14AD5AD10D7223B592C2A8A182282AC372
-524BC3EFC773AFBC1A0878CCEEFD3F19A075FF8715306AB45FF1BC2B95760307
-BC60159FBFF468ABD0D0DE65E308F66943CB484E59B5BF520B3690A473C03D8E
-B75769699973F30339A97AD6C21ACA5730E20E928F74CDCF7596C4CD08477EA8
-A10AC0EDF889F685C6329CB34200253A9865682F4AF47518C14B00EDBAFC19F7
-EB1ED81B2D427CE3773057AABC817A74BFFE3909373E58065861CCDC04CA260D
-FECA9314987E3C64A741F0573924ED453E7574D949072F84388B64B150164F45
-071FAB3A449E4ADE2B774D9A507C35B2DE0562B465FAEEB2946B704CFA85E9B8
-1C81D941119F6CACE20A956D46E24F00818C8B6C191BD6688F83543BFC3DB23F
-65BB7F4D73B66A518C92F21E559AAD015A3BB9AA0163D375FC63A29AC7A63035
-395B7732702AB2FD0841A2984E41D6F1D1CAEDF7D87A8368B3645354674E9D05
-C2A2F21919F232567243DFC434EDE85D9E940C2DE6294C204F564C4875111084
-019DF1E1505BBA2D1762B7829081E452016C9C47C1EBB5A97CFF90F3A9BB46C3
-9AB4059C4C1E6475BE0BD506F7D93A732D49159533F0A776551EFDAF45F42DE4
-DF55EF5EB148060F15EC1B9269A78056FBBFA94CA8CE853D1669C8B78F6E0D7B
-BD280FAA448CC5459DCABB85FC2BB9F82186C49854C81C529DAAC256C1113F18
-83DF375342B8752BB898FF54845EBE5A1051F54537269DF1B2469B2758113055
-1E50DE50A9294CBE4ACDBABF62A9C64E6B12A850C0B890ADB17448068F514C48
-F418F4FD664CF4A14B47910425E1C1A55181E2BD713FD508E71841FBA395E476
-0547CDED5FEF708BC0CAB941DB0F04E833D591665A8EECEE214953CD860E793E
-991C966B7777ED705A8694E2A18BC898E9B2C39B564606B5A3EDAE9C07AEE310
-765477A8430DF7C4807966DCD0A083590D0EEA038CBC34921FD978D547A19202
-4C5900F8D4D19C5A8F90D0F4FFEC44169612E6863E2CBC25209AEF2CA999760B
-4C21F07CE4A017188A7DCA2FA52586428602BEC3A2B52D070AED97512E482C10
-F29C0C9BF26AF416CCACEE7B7541E53B123F4C64EDBD8A47E2F0DD05B8EB4B11
-C559EBBF0C5793831F8079D606716AB49805DE8EE0BE989F253C99F70FEC44FC
-6751FFB7784D8CE077BB143C350932D5090F88EBEE48C425FB6CF525A89980FF
-27F779C22329FF3EF9736936BFA1677F9F159F56F311786004C781152C01A7DF
-2E63C5CE55A43D1E883072265509C773504E9CD185FB68DD670054CC043964D0
-0CEE7E0EBF2972A42B4377965E2751A705D116805B15434A0198AF290273F1AE
-C190131D8296B53D99DB83C3C8454E68E939C8180E393C3A59C0057187156D97
-B290681B74AFD960AC4D52164DEA4954BFE662832D6A288DA32B6A3727A8AE10
-C1DAB806F66DF64C752CAA4ACCBE63120324CB09647D099F37D57B0B774F5D11
-3689C1751FAA84E322D4D12B1C3AC4CE272A31A235CFC3847A20EB006A10EDE7
-446B6C20AFAD9B94D7D19DC903969D22D25C8BF83097668C1CD5A60B8BBD17B6
-F3FBEA2B02ADE6305BED5E3FA72E836C004888A9E3D1E1C084A314499D7969C3
-E1175CCC946DEFDC0211C72C553CFB252C766E145F7ED680C722D72B59FC8B72
-4D77D84042AD4F1BC759AC75EF0FFF8ADCDD0BC65CB5EFB3FA01075CBCA38F62
-F716A0D8D0709FF897D28D1A004B586D39934F9AF66E6A3A57133CF478E9F067
-1D80BDE5B721AEC981009946CB280D6B363AFE2E5A2BDC65218BA88536F39B91
-4E5A0227C67942E58265D3CAEB8042ED76611FC167CEE0E2289EDE846293F4F5
-6DE6FB10DA622DFB280F4449B2ECED8A0313F338CD6556FC81C0187AE54D66AD
-FFC21A73701BE76559565CEACC05FB32ED9F3E77B8511B12315F712F77B0087B
-C7F19D3F849A6C61544B9C3D02EDC9E8A17FFA5B8022B6BD7854AEFB0684920C
-377C6146145BDF2BEF868FB889F5222353363B087C84A710814F12C04BDBEFE2
-C775A9E06AF693EFAB399C45696693A66A3BDEC5337E9D118179748A711091FC
-6EB19B0D6A6859763F7B9A214DCBC47DC8D7AD29DC274A8649D5B4C2F0DE086C
-AFAFCEF427EC3CA64FABFEF61523B758FDFDD3AF8FB4953A41094223A7DF2565
-F9FBC37CAD7A6041AF74FE079CB63A71E923150AAB3E846D158561BABC666376
-781E20D97E007795C893004F0FF6F864B4B4EC2FA91647D519943974CE6BC92C
-9CFB50132566D97A3E9167F0336E74CB76158D3AA128E3F5A94B4F28882C7633
-22B8BD8C8971D38FCD48D970B5AC4817C3F4C930F466C8DA028A78151B3385A0
-419CB4BDB568A79C75BCA3587E2EE44BA0915A98382870E635E040ABF6290582
-EAD2D65F03B4F41F53C61527CA98C78F4C6A66BCAB41387510DE1F1D17CAFE90
-8333DA981F25F42CE4A508C64816AA53D20F70BEE9E7CC4E0102F440EF2178C4
-8656E7E1F90C99D7886336B100F563EAEDA1666DBE91C9FEE857CA24D639D1B6
-C0D11A36DF260B09F64791245396BD98D7150D912BDA36385ECB446B6A381E9A
-E3EFA16E57CA8AB4A794E20F0F91DE57258E76E62A5EC2864AA97D995CFB5CF0
-8D51635906AE373215DA6BE2D42186EAC29304C335F5B925C040C9D0B9DC8BF2
-743A55803F83CDAB10D8E6C6AC093048BE1AF532FEA512C3F549800060786475
-340F4C4EE0AFE289E706863BE5CA703C7E9008569384E748CAE68EC429C1E873
-9CDC6B7CB99EAAA11CB03F520C4A6D93BBCCA0DBBDCEA8CD955399A4C6ED5F08
-3DB926C575C39B48EC426A65F9A209CB529C9FCD3573D3638C9DB5F9E35909B9
-9BE84C6B85C4F826BE36C5DD69E7D75C28F10E36B8102BCB41948176DA539116
-A823981C022DAA84FF4C34ADB130C45E53242A2E098C8EC311F3825D2F094D28
-B2D14BB4980CC07458A94A744A8CF85027613367CF38183CF1A91DBA89ED8B99
-5E769DB4970CE05412EA234C0A9685025A4FDDCD201B1758A3230D24D3B4FEBA
-4C862A86B1E821F9D2DB75F392C1F50F74B56D7C138C43F2B48573C899604FE5
-ECA83E5498528A909BD1EBD3EFE90C52832C20F7A6B20B18AE9AD012FE58489A
-CEC2AE2D8AFCBE2A4ACF3656C3B8F6F5BE260468792E754C5B34437B4D59F78B
-BB257E4B6DC1EE172836B50D48FDE84C53DC7B7BB5BED5200C5A84D992093932
-B2A4AF29B1DADBAB29A3AD9548774801EC346775C1C58B0AA01505D8AF766A2C
-669E5DEEDBC498A105A631C9029476EB5CF17AD92C3B17437723BE893CA4219E
-DBC06050E75E10EE0CFBA12254E20A3AD95858C61FE91043392BF28AA3E81603
-552CAD7BEB03E3B1BD502BB121E1E63D96E03A3D80B7C9DE5BCD2F6C4916F886
-4C66B923534872346F9D77E785F0B9D6F18DD25B324FABD0332CE9F85AF33502
-B1CCD5C33D0A8CDCB8F364DB9CF4A50AFF8AF33E265466B0998803E2B471A603
-846D7D1D12D93E6F9A4842B58496DA11C4F3105DA1EAD121C1DAEFDAC451BBD5
-B3026F46A885C3075AC4F78FA9DD430FC052215D08B3827DB47D2F2A6101174D
-977AFFA061C446BCC62482B4B2C438721443B85A8CD5F9053F3B0F0F67E5A323
-03AB89407C1F76976E42E4FABF2862CCBE4A792E069D3374A50CE6A910731A7F
-C1148B92884265B7080CBC5D0A00663E3BAD9A3E5AC290267DE0EBCF4E8A9125
-C2C3AED7F28F1E960903F3F91AEB7D31425AACE0EE90FC8F7C5A8DF87E7B708C
-54090B44A480BFACC1068F24F4D96949D25BE62A33E9D5D50F333312ED4E86BB
-2D2D7B3C1E78EFDD9998F00C593AF355D01F62A1452100B2B2DC0BC6E8EC2D2E
-54FB9FB9D98C5CD0F9CBC1807DB699B5BBCB8BD25DF64E2380F743CDD7A37B47
-558E0809189B1F0334050C2AC4BC5CA3B1130DD7881A8A45E3A889F0D94B141E
-179739A968C1E8D2A16953F241D2B29CE1C264B240804392E39C0059349AFB7F
-4DD2A97D1D2EDDA252F084AC1D366F313550FF12FF5112A4DE06D030921EF357
-77508A91CBCB78D1075447F1BF200C954546CEC71A8CF58015E90FEAA26ACC1A
-82EADD5A9C5A0E2294620867A9EDE99D3E799A3444E30AF7E71E5C38E4836A25
-720AFFA396E67FBD60772ECF052D12071E3EE60ECF627820565FDD00685C3E9E
-6240DF06FC04BE56C079644071EA53DA652B8DC47C5A2AC31EEB5D70D3037FA0
-AA5D19143C1686030CCED179A17096991A733B846E5229145BC09212571BDB87
-6AA0C3B4E88F35C6A3A1D05018E2990B2A0A5EAE6B3ED7DBAF8C7CA1CB6AADE5
-B6C0B6EB20AF9E9E93D0A8329B5C4B02F963685F485B4F6C0CAFAB3A7B26FF5C
-71C5CA9FDAC213E8A421ADD0A860D8AB1FEF0A81B35823980852E3A177445357
-7ADC5EE8561EA5DA8AAF08224A765198DC8855D6211E35631E5DFDEF651275B0
-AB6F342A4C10ED6463C16D507B28AB8A72ACFB71C8870ABC0277F610F004CD38
-201FA97E452B299133A3035F4E8894E45F2D22BF10CC5A61D54EB584CF303E55
-3DD815FE141F62C97A9728A28243BCD4E21BE88C01A0B2210EEFF1947B4A363C
-4FFD777EDDB3A4E56F24FDA05C7FE9F60D94755CFAFBA4022AF1DE152549EC2E
-67AA08F39E679E63E859E81EE819AB583F35B45BEF6B083FCC2004F4360E15FF
-F7D235CB837837EAFEA94DE5AD0278F8540A1AEB43A6BB67E2140467B4659ACA
-C002635A6AC998BB3F5519D5A88831C4C74F2CD5B426B03370C287308A36D5C0
-B0ADE2FE7B9D4F0565AA9DF27743C46D3B1D21D42D518497E1B24581DF7AB1E2
-0ACB6222505FE5C83B03BC4B15F19988231B2C8399F89691BFAA0D969FFFD096
-FE6F622B800F0E072655B09FEF82F4FC83BB38C81787B9AEFB52BA1FFD1549C0
-C413CA99804164944A1D2219CD7A6640C3869B720107E1B419A31372FDAD3362
-4EC4F36C3C0754A0B4DD592546418C3BE1B694BE3DDEE519A4D0A2A62E6ECC23
-AEDADFF288C39378BA7BAD73FBA07B96330BE471385C6857F4C126357B0919F3
-904202F8E72CF54AD0AD0CFF2723351184FF8253357DA2A606F264C0FAC8B9D0
-07F81727C21BA8FE7530F15E7E70AC53DC25BB3381E6E2B76B90EADA49C06163
-DB92EA227BBE3E5C9A87BCCC01B572E646B9EB17782C2B48EF75784AEA114D4A
-71BD7B1C6A09144D7F5085C1B6E2D85FB13DECD1F6C8FCD190BE2B90FA0CA867
-6489046D5D1AF1B815951D40BFD690BD03828E5DA36B7270ADCDD94BCFA853EE
-7109134D1BFFB8F0EE0BF91EB2CEEE7BBD69175AA3EF7A2B8107874DD9AFE31E
-06B982D00AF5739563BCB18307FA279100C62007C9AE47A86CD0CD5CB82CE229
-CEC433FC66F1521EB7EFA3B95510B2397DC0288F2CFB622E0C124545FD3F649D
-69EAE69921CF1E7340E7C821C43F4173670C17D388FA26600DDC9DE060DCD50F
-E01E0B5F51067DF45DFCE5748770FF36626B6D3CA792C4B8D7E456A255CA16CB
-F85D772FFC5413E6D7C126A5524B3349BB77DE88FC465DBE4D4B2E4E3D29389D
-4AB4EDF41B64F1EEFC8510587306CEE625CCB6DA4201769DD5E1AAF2F9B40D9D
-2B0CD2708112BAB4652292ECFC1AF6B889417E594628F5ED214831E2B1DA3E87
-632BA0CC11D233AB142845621B7C3C9EE6289A02C1C010440AD2D26963560F79
-37B4FE2516EBC239623E2A9E0A0D8BB69EC82E846FE0C5F56933DCCE3575F053
-8953B5B80F08AAB57175C3848F1B9C3908041A710786F5475D47765EAA99726D
-9BECE2641C252DBB20573F61EF4CECDA2A3D751F25FA921EB806C93543B3EE89
-1BFA4432687739383284265CAFDF623228C312692BCF5E233E8703A7F113FB6D
-EE634DB4E4D1129C16ECFECCFFECC6011704610345B43711AB5DFACB0CFC7323
-EA3EE3399BA4A61057AACC02E0A6844A64423FA911D71B78806C3031DE22F546
-4D61357696B0F3EE4B5C41F69CEA685A825445AB53689EB05C4777C20162468B
-B283DCDC1CCE7024850796A8448B76189D977C895C3A2C926762931AA5302489
-5F86490E21D0DBA19294B44563C55BF94925F8D07A16BCAFB8C797934C021123
-B88158BDC19F48B210467BC02952D612A863E1F1628F38E56C5BB73C10A179C7
-A2E5D03F7BDD11BC79EE16C54812C5B0FA1A4774B01DC7DEC115D7C4DC04891D
-75DE7A19F45EE3EEF17C0400176C122F50879B409E635388BA61F67C6ADA3E92
-2CE941F15ADF0B43981360659E02E8A0FA57D13B295A2D3BFA4F098F9296AA4E
-C8B98810B8AC75FA6659F3C28FB92D9F4BBC6C79741C471345C87672B8A4EE95
-CC7CDF7F6FD447A6AB04E55DC3D7422EB524A373B8435DA01C4E420249845DD9
-13C1E80E5EA0D68C819969EAA5F3CFF81A7B271261FB6CE7D1C1567759DA85E8
-96BFE3A1BDDD890ABA7FC5B0C44911B91D3953E6A33C1E69B7C58651A49CDD57
-E740AF490CAA0B3A9AFEADCDD57D640BB4E4C2BFFB2C0AF81972F72459D083D4
-FF2A18655ED1BF57336ECEE601932AC5B4F718006D144C86383D9CCBC659E831
-D4002D8F9D8047DE71FC4235575F1D03C0D12F5C047A9930460101E5330B4827
-E618877FC51051D8D1314DD09291C1ECAF9E16F3FA36D84E0389410D2920A8B3
-760B578D6C3E6686CD334508064D17F6351AF7C1865F2C4B197539B51293404F
-B31283545AB983919A2A172D3798E835259766D94C9FB5F2DDF2B7A5F5EB4C51
-077066BB4BDAFFF8BB96DCDF35EC94A77EF533FEBC52F85CEF1AAA5C089A2939
-D17D7CA326FB78C1F9F42F4FA6328DB31D4B9D50C97AC52365DE7FC5A1729CBD
-B9D3C78B677A9532BA3BBC08970570FE982B3B72B9585FA2F8CF585890B4AD71
-220E37A2C628C024FB9C7B7C12D26CF43DE7CC2A4BCF9103073157993B81B59F
-529BFDF9560C05C6BC7FAA0977CF57A766C676DF4DA3B163B60D73BC1B3C0FEA
-F6BDEE612FCDAB38DA30794F2CAA5D7652914325FEB8826321E6F474EFF718C3
-C76EA97B306D0A408CD94644D4CE6D06F6A3D24C03709C95810D88B38D3C85F6
-F4579146632D60955FFFFDDC25FA4E018D4047AE4540CF20D9F36A0FA0BA678C
-A02173ED0E0D96033B84D23EDF250EF867163D5068A63C244BFEBCA03EEEFE6B
-6BC4609A1F6F8107AA8B5AA1AE982ED8D67850CBDECDB7EF8FA7E61447867B5D
-9E3B015635279DE022508F7B111AAE91B4D7431CCE2BA2D56CAFE71C54FFEBF0
-9B8F30AC3D4C7B00DED5E18583987D0657CE49412931B59F777DDE34C32B03EB
-67CC64FD8A0D3DED8ABDAE904F21402A9BBE0773098DF09FD5378AF589A005B2
-E54C5B8F0223EFE41CF0AF78C7091D0C8B28AFBD271938F41982F06073BDA8F9
-39DBA4DC6590392F3BACE9820D1B0FE88969669E89573056504B8892FB407CC8
-EB296A870B529B7D9E6C6849BD64FEEDFDE6F82A3AF65B3A4555A111C42D083D
-F7C6B09F7AD928C28A172F2B3929AA0038F02C440D35189FEF7797C4E8173117
-355A651CF4637FBACFEA5BEF2ECDAD0835F86D5DFEE8A0D59BAE4517077B1C04
-7FDEC85943101A2BE950BEA0402F71184D33388D59534E01F4422D28F2718258
-FFFCF6E247896C1A470E6D5821CC27C00B980A0763823134081719637A93E130
-1AC64EC572BD9F960C1B50B55948FDBAFCDC604E51BDC8C0C3B188FB0347BC6A
-4F1B77A3708253BFFEFC7B674EF57F467B96793FBBA4D7672269491583929D66
-083116243107B26DA87EB8FEA9077B670FAD425F1508DA1BCE72BB1F702E969A
-57DC0520930A222AB71D09383EF842543E6C9BD3ABFB1A864B8CE1F6B0018F49
-9894CF4826113BEF27B379C916A15C122E338ACADBAC6C5C1F4C730EF8387504
-252108EA4DACF23CBC0C05DF73046D9FBA59599E709CA04C92700233B4442E84
-A162CE13526CAAFA590FB0E2C40A9F307D3C48C94EE0C5EAFE0E6F09E073F0E5
-AFBFFB390276CF294671F5E747A7314EAB3F4A1D8F8AAA3908F3FEA68FC77AFD
-FA0E64AFF2EB3B9036EAF8B9A79107507BF9A4FE20476F6641ADAD2D530ABC17
-4DD991FF20526265E37E4467DBE0CC01BF2C794B37397F3FD242040E11B31A68
-E40C1790200B7524593AA9D0EAB84A76B67E1D03877FC17F708E0A7AC8CC2291
-5CC200BCDC262825C608DFEFAAB22150E344E744DD2BAE8D23DDB32D99CDE6CA
-B655FDF9BD1172C721F3B4B4FEEABE1B4F2F061631D79DB0A810917FB836AB26
-D89DB7CF2B44EEC77257571D873EEC3C16B138ADA8D89C26118A7857AAEA2406
-1EAA6D7341931C22AFD986C991661492A752ABD7A46FA6AF48FA63060E311850
-854401F0BE9C76396DD5CA7331BD3361B62258806ECDB608E4F41E5E57B95DC5
-D007A3DF73886E2CE3A6CC35739C3EC19DD66B382E4E99A28DBFCA1D556A72C3
-3669B28EFF355CE14273CA318A5F3A0A1074A6FCE263AEA08A4F7415D5244B29
-E9130A5A2D42DD31481C8424259688EF24E8075B8F05D5AC8EBD206E20AF5FF0
-5D4B2851247A70292C551E6EBC1BB19BEB6C13F7EC3D8FF9BEB56A8131CE6536
-E02AD75D553DF139858052C42F0051E3CFE89C7682FD118CEA45A0220FCFAFE5
-2F85B4972DC3824F3DC9E30276592D5AA9F2A8EE2369006515DFA3EDDE6BA960
-6EA9E06A9547DBC1B9323081E03E8F7E9B9B7BAE77926F8DC1D3A3E75E504AAE
-A415CBFAFA73C4FA03DA023FE965109286906CDB5950B19B5C93B19E7F13EDAB
-D4EA8EF4DD163A569DDE50AB8935968A187DBFF6126C9CD4A4A0037D43CFE4E1
-E64686F7797A9F889A6848E25B6BC6DC56421679FE5B5F50145DE56C8A7F5326
-72722E4B2F5F699F5607B659E62E0079926FC32DD941C8C30AB8044B02FF1333
-858346272BB8BE62E060ADF79880B8E49DEE95E3A9448234DBD0356256866FAC
-A6320E2DE52A4701D75735AB7C74A141A0E756CD0911E17C15082078479CDED7
-7DA3284098D9EB7EB94C9334B9F828B64EFEDE90AAFB09BCA7EED54A97315114
-9E8374F142219812746B9471C47FEB1A91D72DD4C55EB328637FF82BF7B2BAB1
-782ADC4EF83F236F2FBF18B709032E82B4707E495957A0AC129607612C5C2FE5
-8D3C37A99B1A72ED892CB47D46DAA2D9B1C31D23BB70059C2AD1BA57363C1E65
-54E9F3A9579366A511ACB6D012C5288F7A044313EB0CDB62BBDBE443B693E420
-A819BB16E16F05005F83A19BA6F25289C7B97AA785B0E30467665B66E428D490
-F0816EAC535888EDBC2FB9963E681528CB1CE2FABCF540BC2D4835DA3824669C
-EA23B51CD0BA683BB2F05CB974DE2B5D1D45D5EFDD9142347AF28EE43923FD44
-9AAF8959C65F4721E18CF74E648E29C14767FC1318844ED896CDA69E9FC3BF06
-2F0B6BC8D036012247886F35057F5F730C1C247454C8F079F49364CBCD0E428F
-EB3F0F33EE6E814879CF6E1C77C4604088B0B1B7BC9A62A0CD5701E680970156
-FF9EA53A26ADDACC64F5E982017633F0F52C80C5F8DCBA6E5685661E138A169E
-02EF58EAF37FFB230083EC44545C5B00BDEAE2FE48209BD7D3F104959A2EA005
-4C9D49652EDB0E9E33FE27B7C60E55C4EE9BCA5168480428D8AC31DF912DC4D2
-F9DE606B1C446AF764AC388FBC83F12A5A5D7694AC6EACAB408384D5BB44E3D2
-9E76767BD9F390AC855C4247DA1E0E85B407DF2A5E1C83309C1BC5A5D17A5AFE
-D11E12BC74C54B689A62E76AC69A530306263FE922B60F8F40C0985BCD0A0C96
-9C9A9112312154840EA81291E6856D748035874577C95169FC5CBA4CFE871C46
-0C4CC83C226D77B22A181DF66C6BEE70CE2E4F80D43EDC2FC6682A824935EF44
-6067A5211DB2FCCF7E08C5BED8059DA8A48823B13B7F89B94646F3B19ECB7AAB
-FBECC6A88639981D5A9D0C5C6597FC8603A5CF55AB12C9552259285A49CB8DE2
-41BA124F5560FF9370757FFEC238897167B6B53C0694F2F7AE51BFE24484F544
-311B394AD8AC70DE40D04A65D6E413F010E2594750908BB57A8D3B14F527499E
-E50C191933339E2AD31682A947F73F2ABE9600EC2AEBE8E2BFD7984A0DE6FA14
-66979AFBCBC238912F1D9ED75263691E5B5D7FF53E89489DF2A913C5337E0D20
-B7C44727C0A235170C861616D09E47EAE84878FB85FC4AD451F4252459581A57
-925F0D5F3E7E8F58921F2C400538B964E31894FDB34D237F708E45173F822E8C
-ED1D50EC067AB42B5E938BC87BD2ADC343A53CE7DDDA67B802F737450746CF9C
-1998685EFDB9ED0E3BE1B53586A2982CA3083BAB8648B814F7557C6B804F7485
-5BF3F2CEFD04917DBBA375524990A995CD66810CB1ECE7EA958403E45590F1B9
-B5ACA8C745086DDF991DB49D71D62BF5B3EB7A94C56B3A50C66BBC0A3931AD07
-D1EC0F919228E607FC8C1AFFDF84421C6B07A5C451945560D1AD4BEB7405C033
-F783E36EFFF57DD7FD73B7F157F95F43238BC8471751E2F48B100E78F26D427A
-F55A604F3C026C84622D9A333E6BF853A23C6BDA3E4EC5522E3FA87A556E8F6C
-180BB34524DC5F88783193CFB97B52E2DD0CC729B9838314CFBB792589524D07
-CA95197B6ABC9C108FA596B986B986E8924C9549401E63687C75666AC3C9614F
-C6D1A3A2B587C23E6442DFEE3DB6E217B07AF9B5366909EAF116B929134520CA
-21B2F1AE51A2E86F9C9E63EA1A8D793222BFB7C14B734D93A9DDA0923CAE8BF3
-2869C735E2621B4504F56E95DEBF78945AA14FC3C71E67CA3A14F8E67EA97C4B
-7FBEB8CCE9A8A5E175112BF492BC4676E65812B07AD3FA3602E348559804CF0D
-7F2B7B2D04E1CD54C9EFA0111245D326031F9CD55CE35A9C97864D7D2343029B
-F63CE981834FC6EDD8637276E75447288C9384C5EAB7221B3EBAC87ACD43A7AB
-B59A0CED944D84151368D51D842410B8A31AF8FAC669EFA13AEA737A3A1EBC67
-84B5B4FC6CF7FE3B83FCE1FF87C74805066EF65F6ED21FF106648A0B93BC3509
-2C8A67319225BF42BC0E7C5C5EFA1FA1D1A14813FA065330D88465D62995B723
-4D3A5EA85EF4D64897C5DD3613EE8E823156C0DA75DF4C8C3F4B6CF90F4FD807
-18ECD1B542D02B04A2057D9E9813D75473763CE08011FB4B0AA1D677209CAC26
-ED8E7C2FE95590E9FC14BDC52B3D08FBEFF99C757EBE4C8F2A74A945FB384325
-EC722326C2A4140F1C069E67C5DFB3B11B9BBE123C76E1451F8F25CC79D8A65E
-B58CF9668A6F4EF777A127217E16D9C7EBA02293A983A7B36C45D4B124B452B6
-5078234AFE81698ABA4D3F3C271ACD2DA371AD295518BF8E68EFF06703EB4146
-924776B618637610BCEE5C095F3F94027B142CD375615E110E5D26D4E87354FA
-4F82B8F6690F586EFC0DF41111AE5FAC1DB414CED91061225D30B484D83ED94C
-CDBE83A188B93133B22EC00CFC6DA0B99F78C27BD9B23BC1AEBE376C94C4F6EA
-294ED84CB4511E8492B5BF73CED87400ABBF9DD98302C8ED1F40F5E8847B6ACF
-6CABFE99AC65C1032FE30C8E33065C621E89B376C5F90998E7AC246E00368FDC
-EF9E496A62EF6F273EAC41D3C5C5EE6F78E51F8DE92938A50AAE3CECBC6B297C
-A6C8D8BEF1E781DCF6CFEBFB1330225A372081079133CED1EB680C0046345F44
-5FBFEDBFCBD163CEEE390C735C562B6F2037F2A1937702272D3B541B4C0DB44F
-351A6589C1A68C32F5E165C2D75DAFDBB41A6466C6B31FC45A484331AC6B8E0E
-DDE99F924BD26DB1A4E3508CAC4547445A444D997ABD0F4DD2A6A75E0E5C38C3
-AEAB391A6496381B12157AA9AA5DBD429DEFCC9E03721E32CB89D42AB2D1DC0B
-884933739214DB66E632049672EB6493E94DFB7B928C1307D3B9080890CFE30A
-6A201B4DC5EC38193083CDDF3350E8D4B76C0F112470CF896676B2334B7FD2FF
-AD5E1361C20001217617FF6333D46BC09A688B5DED20CFE9BCAAF46E842E348B
-24434581F35F8D6C275893DEE0328849BC6E3A1B032F8F994F2501977B517363
-9B27CB1D19892FD7B64C7A86AA0BE8E8FE330C4C2C692102688A4174D2ADA70A
-01F8228E5FE55F5C93099AB75444D9DF32E2CD708D54A4F0570F8A264BF542E5
-8284FAA65C42960AC841CB16B017AA594B4BDD4E998629B96D3A4494BE0532FA
-971F12AED1CD9EEBE6DAA5CBBFB29AD389E9F7C8DA1C32AB6EEB68873AEB3785
-9825B153779CDF820940D8EE3803DA8C19E21BC8EE7CE8C57B321A7F9C9CD2D8
-D8B9A9AAF795624C8C9397EE3EAC2EF8A94BF7F862A5B05D6DD962716BD61A7F
-1C07EC9FECF339094D377E232E0B81C8C06EBA63D50BC0B64E71D2633683FF45
-365C146574F189A715AF191BD29FB01CFFD9D9C4C69EEE30BD144B102451CF77
-CD8D21258F237B1EF44853207D620E7FCCBD0D9F41FEAE8D704F64BA48E9E32F
-A1615C6F8A18C8D34D8B73148AF6673A4723420C1874486D3B2C66734AC48443
-9EE21E0EBCBBC22C1ED7D5F08AC5AA1A3F22DA2054F4BB10CCD30D513A4454E3
-FA6CB25DBBEAA4540A2583F5025814C40F0116B4BB430497E519D5CC4E881EBE
-57D9342AAD3FAB1142648CFD6299155D7D6833986BFD28688BD199D43D96C80B
-5232E2B2877EA961FFA8E9DA7EC7F8A75FA0CFADA5B8A97A3A1D8F9D2CF3FD48
-FA818370F2E7AD2FE03B9F97ABBECF337C97161D2F123944C036BBCA9F983C00
-EF987631975194FCCBB708384DEB5ABE7C74B85F9D7916470C0740509C6E1422
-22D6417DC2ACE7A9F81196630DD8859F54521C715F370EF1BE899E09B90BD196
-0925B3352173C50B0A734F65ACD272FEE3F5F1D70B6640FBF1D16A4774AD8558
-7047AB50EE33276E7895D8FCA529D7CD3E7F5C944B3F67758335F4F89971214A
-D4A8C5685A08EBAE962CCC8828AC07852CD86F73C2B29CAB113F30DD712B482E
-7AF5861053B2DAF66D4435BD075F5846F3E4B3E280F4CB9E0D2527727E2717FB
-FF3AD11BFC7D7CB8AD8FDE1176EB4C5716D326EC07CF6803CCB907F6245008E4
-918C582387E65AF3975E5A1C723565048F9535F588D2D95FD836ECD4206DD864
-EC0CA5781B75DDCD16C56F238D5DCE5E2DD5E98410AF9DB27C0FFB82734F0DCA
-812129B1B4036804F9CE7732C6D8520BC605D08759B8934126C8B4D1E2925BB2
-03D7FABB36ADB0E37DDEEF17A4095EB414458C28EAE187B42330812233D66766
-DF00EF7269571D8F5B0B9DF4C75147288782A25A5242464BDD62369E5BABCBE0
-E941903441FEF0D27CCC90DB0B23227F6A6ECB4844B62F7D19EFEA6DAB6C15D4
-93C10ECF818A5371FBBA71990CE09DA9B84BA7A839BAA3DAF1B59DB1093D7892
-09268A57A7CA92AC65B665246981D165D8514BDD36BD083CC7B9548A8E18B2F6
-F520CE52DBB2AF50CAB62DC30670C55F06F176D0DF351A1C4D3B743CC70EDA78
-C9A4439521338C0626D62046D3C301AE9C551E952A945C5C7CFAF56590429AAD
-BF1245E40501DB9C694526CC1D52CE9EA95EE6236812E8C7FA63E559C71275FC
-FBDB0BED9EF4AF403075082F8E1EA5DFCC3C45575FE2F8163743DCBE275E251D
-FD1243B28B40E5D435BEAE113036E783C7AB17E71687B0B161D4721D9C5FE168
-5D5DC9DE54915C2B00214318C9249C31294CE618B66C3DFD9ECF8EDF32CDDA2B
-E9ED3712E48A17120BB7C66D811B88BE02FE18B6B502286781D394AE6057E519
-CD8D68F5EDAA2BFDEF3D266259ADC7AA1E5E9465A53D9E2ECFA1504C4AB2F944
-BF2C8967D76BE4B599E3E76A35CE06D51F30263E42764B3168A32B04AB2E001B
-565911AAB607FA5B8F16F30E3415F82CADE3B1441406CECC125F4DD0D987E23B
-14675EFD78CB464BC514293FBD9B67ED482C7D0B1BF9072C2F631C60E01B5BFA
-88ECA463B4721EAA6E2B34C1E3F0F90A402DBFE03234837B6DAB7E0CD72CA065
-87FBA4C55A8DA3D6BA2A0B43145D46D914291003388940E0328A6CBB0D1E83DC
-0DD20EC415ACEDB31539284B64F240A9D0C2DFD49533EDC6B678B46CA186027D
-69DBBD6DB27B41728167F8152BFD18A07304EAA80D103B76DBE87B208577646C
-0CCBA19118BCCC910212EFF7533BB8730BE292D247089CA71153BE22CBE2645C
-01FB2B85FB39C969431729EB31EC454E429F8E6E1FF836B7343B45F5AEE2FE6B
-AFC596060D18880375891730CB9072FD5A7D16C56A794C2A1D118DEEFF2CF857
-8CCF6F08242D1892E8DEFF85DD8B8B7BF47AEABDA115B282C27C7DF8F235B056
-213351D882CDDDF895D14F77E22CA5CC659BFB8B116B83781209B05037DDD0AE
-0E32D8D425CCE833A30E00D2E733FEE802A7912157F5636E9EADB8CE012FB092
-BCC584613266C607F7E496F0A5A3CF850E821EEC233AD1112AE56956867D258E
-D242CF1B1A4E3358ED9F50BCA552A1EEF71C496D65B570784A716950D286C187
-A1A71121B581EA267B569E0DEA8BED793C74DBE3AA2091713D3ACD49D65EE813
-B2A85B8EBCF6711105915BB3DA9E5FD2A5B5DCCBE823727356A4202746A374D7
-1ED14E687B95AB09340275699FAE367973C1A1B7DC1FFD9D5422E052C8AE2610
-1370314197F6C7631BAE6D1198D59B593C2A2C9CCBC200C83185E63999632B99
-CE7C5B28B5F02C539660C975B0A18898FAE8C8E906B86D0777D1854BC31988D3
-611F2302C9DBF6321AB5A4FDBBBAF575B94A167B3E31F8938CC1EAD88654C1CA
-CBD3106EEE4598DFEDFFB9956BF6C00C6B29B945FE6B9142F8F0519CAC769742
-1FC3659A650CA49BA6D5500762CB2F6204936C52DC24BA48CB5920E51001BD25
-4A5251713D49A17245C219F2B38F87FACF01AFB402C83B84E03DBDF1F7325A93
-6C7D2392274296CEA3123F3CA7D73F6DD889C78929953CBFF4E74E23A02E6EA0
-60F49155C7CCF3C2CA079E7E3D804534C42938EBC7FF94C6129F74C28F527474
-1D1B32DD19E811CF73B39F300DEB78BA1BB953A0A938E9A9A5F2AE613D422F5E
-5518DD630E209642D814D01417FB9EDCFD391436388925A9DB5D663EC84ADE2B
-E087DCC33930AD2B76194DD4DF12F05BFBBF7100FBA22DEB809C67B46EA0943E
-5D61B15B97B7894383EBBEEBADF5805822454C053DF5089ED484552C4E1D2900
-A7AFB5152D2CF2C501098AD8B2491CD733DB1A5818C636299FF98F96A7E9027F
-9147FF5EE7A170D301A2A58A32121E64FB78669750EF65233156130BB51DA26C
-C684CB4946E909544298F6B8EC328D6C7322E838CC41297F5A1E618FFE319124
-305DB0285964CE1DD0307F1B521E08B5F3C57168A538C2EA1DC3B64D986D9A43
-BF83C5FC9E6A9FCC2E6EE9D7C581480EA0A1E3BD3171F13D576E75A9C3479A67
-712DC0D52F47AD6296E5B488F9D3A6E3754C872C2DAA6A5B5FC0EB340F985E02
-3E44E07753BD36D431F4B3385CAFD82B7A593C44F4B090188189ABB97C593CD3
-7F6E41BA6B5EF6F9F7F0BD98236D8A2541D27111BE59C4664B361BC681B3D50E
-28C97EDF51B365CEAA2B43B087B1B6333A27F1C1C01A9E974CD87EDDD7D184DA
-02989F47F1188FC701E66B5306D74B2864397C7F3817DD6A40C5D26E098BB9BA
-58D94EE5FF0BE890CBE7717D9042F405725D2C08AFE9AE6118C2D4024A13CA4F
-4C3FBE1A6686290FBF812C0442FFB474421E4AF7377A106CE8818D4A70E91FEC
-14F6E4493DF86996BEC392E47AEF1B21CF18673682BC666FE16F9A32F752CEF0
-F86E481067C9C83CFEDEDAC560D390167DE04B9EC0FF3E5FFDEB9CB00125829C
-B3EED3E9668E4CC601DBA68AC54DE334E5D73CF78D12E4A0B4DD3C4AD8FFF573
-91998254E3C1735FABD53ACB450D03C9E090D57BB542CA8BED6CC382D6E65E89
-6C3D1B34F3ACFBE8A92488F5F5FC840BF7C75AD46945A56B3FA8FECC3EBADCA3
-D55CE1F07975B0A2D04DB2C3A00651D2C10E900F54372D638E40E90FA811EC19
-28E524F84432828BD8777D919F6C0D1C1AC623EAA258349CF2072AF11544AF25
-C93133D1D3D358BF8B71E94F367E5641148513CEEFCC461A328DE1A9C43A6DEA
-123502E2F98A9FA8086198F911168AD85054AC753747E7348F964DF5D039E364
-20C3679FA4659C5F5CA2D3EB75A2620CCA0304AE592073D0C5FC57692235A37B
-ED21009599AC22E2D2C3E83651B3FA45195BEC1396857546FD63391E28C6084F
-36E782ABA8F7BCC01163DCD85523D0BFA9BC91DBEDAE9D7495E9DE5389A10299
-AD8EB3974638A05E322A58223D504E234FCEC89629C6FFC6C3790DAF7E6F81DF
-C46DFC8AE53DE4D3676BD927F348EB7176ECB3CBBE7247775CF0723471EF3085
-3ABB677186121C901275360541EFAD48059105658C99366651C68B4EBFFEBBDC
-5C2B79D537A9D193E041546C25F3FDEC2E760A5410571016F9EAFAAE8501693E
-69D2CB3C2CC6CE248FEC8F1C98654F2A9DD5E0DECFB6913CB22A7B92682E3B32
-22D49ACC4A98E9508CA9BB539DEA589657D96E0E35A205C9AFB73C72CDD485CC
-6E3C435EB51C9E6D50145A568A00F51ED4043D7F6055AF350BC4AF9C733476FA
-675460F8584B8974D7061D351308F0055BFC3019AB79CBBCC8AC26D229D605B5
-45B1F5D7B506DDAC71F3775DF4BBD00E772BF1A857644E51BC31DAFBB48427BD
-148C377C6DABE2BC17AE234EBDBF3060F7259A0FB6561B287D4AF864DE29D7F3
-0A7C9A2ED28C6446DA1A5D6F1C6E922A14D621179EB82978C85A49B718534A69
-895D0C53F03AC89BDFA9245F6903805203EB211499533BC29F5AEEFB01EE285B
-DE97903C9F88E377AB6FE0D99AC2408C0C62BAE3FD818539DDEF5BCEC605A770
-7C730C9A7D97ADE411301454145B6401CABE6447ECACE2A613F2ADDE4DA61B40
-BCCC22CB08F7F5E516DB25B1B2291618619C380A67F628567F0495A9EBEC04C3
-3478111CBD51536386DF9E816148287196CD07E1EF1AF1E425E733019201BCFA
-60D2004615986454AE2125A1993E56EE9C8A17C572B69F881D5ECC28E7FCF5B8
-645DFC1C47B263E7D6CF826708F40C19BA4E3C2085E502247198989AA7478A75
-E2039E37BE2C697C391587054CD67A9A07DE929BAA58F996BAC2A9158B52B363
-627582713C7AAF0928073799056084DB51A47D2CBDD1FD98BE64E732D74142D4
-5B0B124187FB0DC5B93602F064D3EE7F58E02209FD3167E9D85AC5DB9E306435
-609118474D16FA97DF7CE052934BF0443E0E013E5C8DF7FE2B8FB9D5B8E33892
-0286E51A7E3112B865B69AAFE571399750BA685ABD55E1958FC8FB8910EEA7A5
-C08EF52A8C543568EC4FB1E77ABBCEDD42266067EA264946D3AA4B54EB337D1D
-C08988FF3CFB685FD00718D8E3399CFC29B26CEE6A4DF1EF624AAD58C1949779
-D32AD29E2292F7330AC690190FE6A1D9B9148ECD7F2D28F33446A783A4E0F5CE
-395954048BB8DDA27AEB24D52E77227B64B86F5B806483DB10A7AB800079DC56
-6427EFB5B913236FAE3477C5A1DB97E6B85407AE86193366BAD0505E231F651C
-91BD0B0724B13D8DA4
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
 %%BeginFont: CMMI10
 %!PS-AdobeFont-1.1: CMMI10 1.100
 %%CreationDate: 1996 Jul 23 07:53:57
@@ -1599,3498 +253,2902 @@ C1654A0861D138AE84F16B962C0122AC9345ED069B0D66F1B775F1D5E3CD3B
 0000000000000000000000000000000000000000000000000000000000000000
 cleartomark
 %%EndFont 
-%%BeginFont: SFTI1000
-%!FontType1-1.0: SFTI1000 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ecti1000, tcti1000, lati1000, lbti1000, lcti1000, rxti1000.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Italic) def
-/FamilyName (Computer Modern) def
-/ItalicAngle -14.04 def
-/isFixedPitch false def
-/Weight (Medium) def
-end readonly def
-/FontName /SFTI1000 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-95 -321 1415 932}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1D9658B03F6CA8
-B946CC6A042A9252DC769230F3BD7E28F4F053048B53BD212C59DA9014DC7AE0
-EC0B3CDA53F5E7841151CA72391E3A10D7516363D380459F088D76B89C3EF169
-B03C4766CA4B85355DB143022F211836E5D6305B246CFBE9FAA7BBC54FFF001A
-2DB17495F48D6E54B6FA8A07F235DDB3A77888969BBDAE1805687208571A3504
-BB3369B5BA66993CB4F6637C6D78C2049B479579C840FD79266C063FC5C3E202
-CAD886763ACC659E21F8BD2E4BC8C80B3E38FECFD3B86DAFB461ED9E7E1A0A14
-95DEDF3EAF23A3841911D45492010C1EAB95BBD126557690A998052D72DBCE88
-490275B598CA2074F6F567E9FE9BF00422E28353DFB841E0E3C0022F349A558F
-2BB17A2A6F7BDD8B6348996C73F5B17C75A64BDC52975EE709A13A78235AD9A8
-9D879EFBF0D6F37860D59ABC08F10D3367C5B7DAB76C265E687CE3B6352AD978
-9127D2DFFDC37BA11A4FD123BF2090C3A371D2D4BDA1683B0CDC42D90BFB853D
-612B9764DA9E47D93BF2AD5A3AAA6CC25DDA316BF4B8A357E0BD8DBFD359041C
-E30E763D97D07A2599B250E855837276A91317E68C073482D86B13EBD8AC1FB0
-84361E47E0529F4EE7ECF91C20AF7F8F0F3C50D555F0CE868F575CA4887169E9
-31886F602E3FC3ECE4C8C2A44F2756FCEF03AF7CC9DB3DFBCDF90E884AE2A1DF
-7BACC3A3E210B235B7F548E43221D2B5492C8C2742F7E10B6AC4B028E2534A7C
-B78CF6A4CABE55C1E5B193BA5A18C3CB83D520B4C370BA1F63FFABB2ACBC287D
-AD13AEDEAFE9598B4393F13501807A827B6662A8AA22453875D179A3C519F5E0
-68809F9BADE016976113E3EC1E77C9D623DB208F4458A01D03FA3098878D8D6E
-412F0E04466246A5C288DD481826334369F5B4853C7062D03CFA88A1DA6F6F50
-5CA0AF78EA1391B469859B00A7B0820096920ED9B916947493B04A964D732DC5
-F4084084A521945E1E080B0C9434404BF60D673AC6AC600FC03200B0EEEE8E1E
-3138731AA734976342C0D7B4BCABC4A5526F66B4367215A14348C871E99BC247
-C7777A033F4A061B524B2B97D839C5CA258F772B60076B1FA827241F6AA77817
-DA31C00366C28046CB4A25F352611FE6FAEFADF138942E75D2BC26E84BAF5EC7
-E9A027D006A71F6165D6BA6C48B28A43277474966DCF750A6B28557C121308E5
-5D30AD9647EE836E7FEF2A6ED048289E359C54E9010A912ADD3BA1731919AFF2
-5C0E3D258B2D0132A4E068D1B3E46C78359A538D3F491EDAAC90F6C2EC51CAE9
-8971C101698A4D1DC0570D7F6C476707543F829126E86C981B1ABF777B11464F
-13541B83DF22AEA6E178D5B630BCA75AF6C3954A58E620D561DE09809FB5AC47
-8F2E52FB517C878F1E7C9B0DF328C1284E4B259EBE17E067DC85486F43A5BF90
-F745659E1138A3DC9E486D4E8E040FB096D06A3FAF7C41FBE2C4749AB79EAAFA
-A7490F5819E5AA671664772FF9981427AA7B9146CBF9F15521CEA6580851BD4E
-642A4D1B0CFAC76C11AD5E3FB277FC745DAFCBBDB74C8CEEA8B64C7D8C3F99C5
-2B31B8590E76E4852F907802E624888AA3B545837B730AB4F5332D80C9E5B717
-12EC51B7ACE615B2B6F59CE6F11158F191CAA801ACD47CD16A19541272BFA69A
-22C76302E47C25720D76B5CA6F55229C7436A0077B2EB8CDE617BF3E94A4327A
-497A4E63244DE2E03A09A9FD459F6FBD5975E3CD0F4FDB90F2AEA7197E6D7685
-339221906C6F4ABAA86C60E5D1B682D98C99E38B0CFB140C1A8DA85A30FA6C8E
-B90E8CD4B1B28B1193A9D86770164CEEEE38D7F23A84AD292F2AA9391866DC5F
-E396C113B45485013DEF503E52442DC0D8BD0EB8DED6B7F93ED35538EA4D574B
-5CFB96FC252707566F1E75D597AF192AFA801A097137A3C06457D8F1D82C084C
-821BC367059E01E3EEE319902CD31BDF01CB939FE771F881F7FE31A4F18310B0
-820959855E9387EFD7AD553DFC13377E1A883568C7B98C4BE2651D1DBFA54667
-0BB0F545C53C146A467A2B1FE385E2F67117502589946B6CCD857646A77A99BA
-356ADFF1FEF6F14DEED94625B0198777868BBC8E0539C7748BB7531E32995D3F
-FD777D555B22CF936A844FF05750A856764ADC18854135BF8A74C56DFE1DC0F2
-29CDEF162FD7456EFD747DD6665600A4464C388256C0689EA93891C6F7E80F7B
-8CA32EA57782592F15D28B49C5D78D509F6F6595F7435BC8AED00CC85086B55A
-554D41378C0DBD9B4A5F59DA78CF4A345D495A7649FBB5C703BE9B12BAB4F088
-9980C4AADBE25C90D7096250DFE5F439639F339043DD02D1E7E91BB698E8712D
-8D19CC888119EFC8D97C8B44F79C286288A1FD2251AFFA1A1729F12EE46D7546
-D91B7F0C2EF2318FBACF5F30AF2D23EBF2E564166A0FD31EB9C8E9E48CED8475
-882B9AFA057BCACEC4D91D6861625F254D66F6FC279902ABB867B3CD62F1135E
-58FB7EAD2A047AD848A7363862C3B863D3C871DE8112D4A642C7461ED8C2AD3A
-F0293FC8ED1C9996
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
-%%BeginFont: SFBX1000
-%!FontType1-1.0: SFBX1000 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ecbx1000, tcbx1000, labx1000, lbbx1000, lcbx1000, rxbx1000.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Bold Extended) def
-/FamilyName (Computer Modern) def
-/ItalicAngle 0 def
-/isFixedPitch false def
-/Weight (Bold) def
-end readonly def
-/FontName /SFBX1000 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-229 -316 1737 939}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1D9F9A167BC064
-00BECB75078C40B8FE29E6169F9CA9EAD3C8CC4B31F33E66B30F4CA5F0F743EF
-DC2B1859C37C4291C5D64419125B705ADDB0C085612F09D6AC7DC4CE8B35EBC8
-1CE8C5F6B0F8EF41A213445DA7BD05638DF2ED81B404B2C3CAB5F51C2A4263CD
-B74F54D38C2B4C86A0D6E76212B7BEDF7FAE6334339A8A249C1AF2A51EF48DF3
-0FF609A25A0FA1EDCFE4A5DE9F3BD59C2DF4BC1D50B4BC3341CE01EB8BD39743
-8E79DAF3EC0D27ADDC68BD517E4225CF4C78D8A72E0683D6BC285C21EB4084CE
-E8B4A08A05BF8EDE3D97CCEC74C9E9CB21D7A52D5F7CC453D2240D8168F765D3
-F7ADD78BC19857C2383EBE7036C9E7DD0883919C1649EE0B35396BB484568F68
-18EBFF229ED655CBB00D1D31F80BE718631475170BDC146470623E7F43790F3E
-7E638F184A19FA7C41FB65C57F943116D297C764A50F6B2BA83E9DF429D8E4CC
-2F9564E06F04E59567342AF2B1DE89B1A0960CD69C89E13E08C1063FC92078E1
-22523E41B1BC8519EFAAD6DCE266E951DEACD1EE1AB160F414C2BE609D0D902C
-A8C73258346B52B14D43C252C9A3E7DA8EBF491EC59E07AF64E71172286098BA
-3ED1AA95CDCF1B2D5E8CB973130E8C0188F9951C62F04404166720C341B35EDB
-458654159220AD7BE5F195D5D1243B062CCDDB60BA4124D5F9BB1FB1585EE99F
-D49D0BF36808DE251352DF811E9F039C1267B2FF5415DC581FAD73549E22E4F8
-0F05C1A852615B62AEF4155A50A03B5D6AD11645F38AB4EABF4E9F1245797ECF
-DBEEB8A77D41960A13E886B36C8712E36D1C8D801BC81F3A92E9B9592E3C8F41
-66A6597472295C1A0F09781A22DCC8B8EA7B18FAF763F5BC9AA0B9676C4D3014
-05160F9B3B8FF7CE836FBE0F4C2A9D0DF3B6F3A3CC2CC70A2B10D3194194A4D7
-91F756E98E254A060C183C0FB485F0CBB97C471EB8B35536EEEA92E15404468F
-F6A49FC7F0377F86B0E3DA3B83396DEAFC24FFC850E62EE33AC73EF5BF683D9A
-332101D526C505AF1EDABF95E5BE758D2EB86322E992998AE060FB7403020E8C
-BC71BF2164719CE2534E467DB93146EC76A522D02D32DCE37E9DFC2029CB2787
-20165615BB48132E0390C70E727962F446E9C589F052ECE51D1F3D2B48DCEAD8
-152BF74D5579B5A41C0A3D72F582C0BBEA7AEF0C210277AE0937E0D3C3425402
-77D26CC23934FB5CAA3D39A47EBE6BD5E3C4F6E4632F3D26725AF65FA8A79B5C
-062C6CE5331219D3DB3DC54EE1EE6149F64F24049536EC80F2EA982104A9F80E
-163B9464FA8F9A8F8FB04C9D0570259653C198D0616D77CFDCED41C91EDEBCCC
-B299020527C9AE75AB220FF02ABC6F0AAE5F86D21C91800124336EBBD8289D0E
-9A984A2C7920EBB2722067BA36A6F3AD360A8CC682D8612B8C468B6249A951CD
-1AB6EACA1812BAB103BF99520448091D3187C8F9848D28E81242F2AA8C2A0EE0
-197FC501948A2F1E38D20B0C9A9C9873D4D6C551C870F2AD1C5FC479243BCBE2
-F0B5980980893DC68CFA0967A1F43D482CDF7EF767F8D869945B938C3DAF7520
-859209EAC736C703DA63FD0AC9E9F69B87DF1F84EFCB2997C5DB837A3A55ED7C
-81B805FB95FB63AA3986D0FE5DCBA28CD7E94393452EC6876E901F2B3EADF02F
-9C151E481AB18A39F7865FE0C33632490186FE8FABD0B28E0E1210793D00DB52
-40475705766CFEE36331C606B6A2107D6A48A8E0536E58C703FBE92C089C5574
-832207126FF29BC538452B9CA27973FF22A0D0A42FF0579CA53CDC9A3FCB8E51
-767F35D50073E17CDEEAE4A7F0959FFA480FF4A42B0C0E056593AEA52D3575DA
-03DEDBC37B6E851DF1C389B1675ED8953E25AD53FEDC27FA986E5ED3585B4D9D
-4BDBBC980E5BADA5784B94F5F0D320CC36B4125B2AFFB93523D9F15DF7FD8C17
-AE5C262337855AC2256A1F88C666D89289FA3EDB6AF6846262DA782903707483
-11C9CB87BA94275392766C0420610DBA35BE10A214F78F51E932E96201932071
-393EDE1269C402F737EC89A37A2BAC8A56474AD6EEC15BF22EA3718F127D165B
-E6CB131EA68FA9F717F9D071D3C018B7321E63AA935B8626B683087751257E47
-D26E7AB250DE4A57B781D221C2E0C92CFF820CBAFCE2B2BB02924BE9E803A1F4
-E8CC696F5911BFEF3BE6E1025401A52997D43ADB30816C67D3E4137E2A444E89
-93B9C48680054245EB5498557F6A083C41506866793BD01D1049072AB4CE4775
-C2952BEA2FCFBC8BCCF95A937AD3BAFD9547DFBC86EB8EB27522EF0EDBC599AA
-A09B236EAF9B48F5D366083E1E62D73A8A2F03F06BE539108CE3D7D6FDEAB359
-4E3B700F63A024D9A28646BD2778EDD7D7FBE6BCC0DDA25AD823EAEB81855292
-A77C4348F534CF6EC42AE08F9109D02CE66AB3DFD317C62A3DA4E58BD27EC19C
-8D31C93A7047AA549D061FAF49EF1BEAB02D0ED88C388C055D3F67A2984AB0CB
-15C1E3AEAFE213A2A6444AEB5EB47B2AE56319ABEC36DF0CF09FC63635387137
-F29D045F71BE529B96547A3AB2A9B42CAF3BC022AF92AB2D13A00167F4448962
-4F7D7045B69A39F2CD165C1C02EED17F9C23C6825C1BBD64429B42AA0E812EFB
-5C64A45C9BDF83822F2CDBDAAE8A14B95868CFE747F700D5F4A778E8CE1BA6B9
-16B884A94C0B781D76E12A4496F04A93EDB7B6F041EB7D8BAB60F40809A1C563
-F00FB88D12C683D583639404958D708826E752C197F861A659E8251E5D7E34AC
-430E1E2A35E4D405EF5506E704FE9646D327DA01637CEEE4F0A67D901A1D503D
-6BF751CE7A783161342DFD0C1BE92E4EAA56A06C320B96A8CCB587B77E53A34D
-B9AC1F2149B2D60169538D2A3932A06DD26EB6D15E65ECC5BFEEBEE7573D31F8
-E6DE1904EB35AD47AC9926A4E0DC847085CE787BBD813C15DA6BE2D42186EAC7
-93193AEE3A19AAEB1AD63991615A2F1C12F052EC3919FB92DBE1EDF020EE0461
-8B1C6F2780C6DDF4F26C1B143FF92C2644D45E4FF7148E5ED8DAB1355C50F246
-011C107F3E02689A186C8F15DDE7B3A9E18999CCFD551D3AEDEC14E81AE0336B
-C012FD2E2BCBE4FB941D2BD6A3048172E176552EEE18CE2997C90C883A0A78EA
-E913E04ED663EF2C63EA5CB9517AEA8268E3FCF67EA5E3C0CE42CD0E5D8CBAEA
-2E083B0C396418447177FD548D2F87DEA7AD54F0A56D5902AFA79AD535A6A202
-F2052982D388DB7A0B4AB918A12C026CA39F58608A0360F9E92CE707E362648C
-A69430AC00F3BAF2B8F2B50DC3B4359F2B3F7356BB8922EEA4D008B69D9F941B
-A80871AB1512FFF6D54DC35284340CBF8A247B6CE16FEA63B75E6B1B69E4E114
-1811106954C59C45019557A4A5B85141F5DB1E66132420A36F92A6D278952CEC
-57397B1B19CEFD61D46E8E6251748D3A5C51627595F5384641389D410DC113F8
-E414A2092E1F016894547B9180086F32282A9E5008BF0EC303D795D819315A07
-7A53626EC56D1A51A2D63B302BFA5BFE76725BFF2763DF7A1BE276D38F9E4900
-1347C36E5544A537340D3432C95C0CE6FB109AFAF835F63ABDFBFB87D7CAB309
-8DECB48D92918280061A3B508E3FE77B38DE70C08F2AEEFE4A95E744AC9F187B
-5A56B299D19740758FD5F83FBF45E3CD135925471D708F074CB7052C84BE0880
-6D9BE9CC6CDE5123C540750977BD5C40C3A06C2C9635A3D185E483A0A0BCEBAA
-98ED8F9E91F811CBA81DD774706285A5D764D47C6619BA577DEFBE2A8F4CFEE4
-5D4224C668D733858A9A2BC3165FCA696BFB81FB9F6D9525AF9142F7D9B88CC9
-3C4A04143EFE905C3A53DB1CBB576FA71515ACDC4E9FB046132DF4391BB1BD17
-9E3D9F1134A08BBC61E2FF7C22C5414848C2EF8EEA7EA0E3BEA00CAB58234DA4
-32D462D39FD27B6D7075490FA8F7A2CC0E61131FD16E4730C3E052517CEB7161
-54E39C02B4C1C5203AFC3DDF08F9AB41D6DB7BD688D8741907B93DE8D05746D2
-CFCA62853EF535C720963D87F6E98BD70CB0077361C63083CC9EB2AB48724F5A
-C7C1EE072EAB1591DE9DF8FCF694C0A0D00897B267BEB94DB325318C02FE0EB8
-F2871ED36C458381955334B2DC5815FB50946F6F84387177D9E09E418B68C687
-17BA7EDCC0A431639DDED783A0838DB4FEFAC3A50B2DE33B535AFA7D8DD82309
-6C2AB536486916B2F335A8F897A5D340C636181FC9C7E2BAE55D9A65F4703045
-57D3C717030D55D70DAE34526ADDFDE4B3C92CE801EB0158E3A53936693B9D9F
-FF23B80988CDDDB2F94164FABDEB6E90DCC5A7E098E41332AB4A1EA8E070198F
-C4AE542B3B20A60CFC9EE2368B474D025F05D1F96032D0329F34EE5B5B450ECA
-29655E724FDA6AF338DE98FA754629431BC1E44A567B1408D4DA1C592A0CC28D
-D57201857C85A13D6280F1DD4EC25B0A494C9F21F04E2205464FDB78466EFF0B
-B058752B8FFDBFF71174C12AFD587BAD4296FFE66EDD97F6A14AEF4FBDCB257B
-E600F6AEEFB534AC1E1047CB60C39BA36E561B7BF7EB819155CC4339AC60BACA
-20DF47D2D9E59EF22E588431EEFF2EB5EFFC3B585084E89E81DC0C24264F8009
-09EBB172D9C25C0D11FF699E670B493AC2EAC2358BD1B72028E00C36ADC9BA60
-732B3B26ED56BC82B3DBA957FB4C02E8E2DD90C2FCE345BF97D8FBE13ADCF5A1
-BE554DCBC49BC30D6E133BADF6D86FC17A341233109015CB52681426BAB5E93A
-5E57AAF28A69A9FE2C849713EB0CF82D169006B74C02A1C1F6C380259388923D
-66E40BCF28CF9DBF326C93ED85EEDF22A87FA8790A48774204D4563D51A0B5A7
-3A71F8E104CC29E7EF753321EBA17CA8283BA88341129513E928612BFB8EB983
-331A1D69E8BCCF9303EEB299C30FA51A66F061275483A96484F85AE27775672B
-3C002AFE7109807FCC60D682BCBBD9984BA2BECB273EA14572ED74D9781C6E59
-501E063BEFB1DA90060CB80071B65CDE7FF58FB70849517FE7A0A9B5D572F1CA
-E6C5B3F9578207D7E69A9F0B69B68517AA4845CE8D31CE3721C4C49FDEC385C5
-933B63098D91B4A33BFE7CB26C8E4D3D81D4D7CCA6305056344B396BFAEBB5C4
-DC13B15B757C5F8F182E8366EC4B3961EC8037F93EFB11E28CEA9B446793278B
-612A84F26A47EDE9CAAA63F2D405BDC6B2CDEFF681BF007F9FC5F1FD29578B74
-EBDBE7A95014F86EE9E1BC3D775C1BC9A898B0917E087BF96EC6E82FDA152006
-7A79AAC0A1C3D0A762D9BA1E7944D50A817ECB31744987159A9F70A08CD713C8
-65A988A6E45CEA1A61C3941E1176C18EC8A91273B225348A9FF4DACA0B096148
-6DC314286F42513CD54741AE6F729DE20E79D59BB69C887F7AF3A7D3F8B0A1D3
-5D40B7522486BED30509528A4BBBBDD2A50A325CD0CA221529B26D1EDBB53985
-F718EB894E2A0D724F436FC98BF053D5067935EB118B733F58C0443DD3D64D76
-5F774F261FC14E5AA8471D287F1C04BDA0EADD20298237B2352D4E7FCD49F5AC
-C93C65A71042892E2FCF538C3403E53291C6E7195967FCC6D767D2C0572B0416
-00A679A61D7B8261CC3B395287ADA6B899BE3DE48E1BE994C9BE0AB599DAF88D
-0F8CF24A8C78A70B4591C6EFFCFD672E9A2D96030C8503CAD9B4EDF49999671E
-9684077EF2068F18EBFF909D24102E3E79F997B5E7C5E4E070442AE0685DC67A
-04535D97466722D32D8B1042DE5D37BF6BFCBE65A6B6720EA143169B3A34B5DF
-C57857E636D4619D888315557DBE9DC603F451EC86343CC765CF32BF00E63640
-A7F2697F3D6B82A0614B44268DC41ED693C25C465471DFD0D90158B1ADEF3F2D
-E761F2FF65C4467FECBFF43F3789D2BA336E083FF2EAE5F6BF7E234913241CE1
-D463338059E5DF714572CD9F552DC1788F746DB2285356FEFEF131296558DF6E
-D37902E8508E69374508D392FBBA98189605B7114D71719C1184331DF27439F9
-C05F5AB76980EE92597F087828494F7882DC730771332BF01043B0C95CB562A1
-6D928920AABC474EE515FA6D3BB0415F05122BD6D0998EA189DF6749FE773621
-5CB19FAE8D4472207AF37E91749ADC4F1CD9752F903C1DD22A7E42C5EE6D200F
-3EEAD0F2030166028F61D005072FEFF3FBB46549507E87F293E9D2A73843ED55
-64F7248CEF3435430F2AE7A106FC01ACB11B33677146306B414CB019ED2B6B84
-735840D0CC6DB88F59B5D71780BC8778545636337BD17728BB5C0314CEC937E6
-AD613635D1D8431DE6749FF3C632B9331B16AE96BBA47CA99C32FBCD23EDFE71
-1D06D699907B4E95B379B2939A4CF024C1D60D6C032E30DCFA044C4E7AB05ED8
-595448A85A13A14973415269767D225062845488B79685C54BB97866B13240B7
-BEF0688C4849D38B065DC55C2B6F86AB0A9BCA32146B352449FF4375C6549548
-16765A2EDB6A38E948C291C97C9ACAE35E92FC52FE171632E71CC6EDFD98057D
-DA5E3513C61721BDC7694E0384BFE1860945EC1E66FC9392BD9D3C8AA735CE55
-19D94ACA804AE0BD2FF853717146AF0AAF6A5E3A2F218187C3F19216D05BA1F7
-F612BAE6AAA2FB8ABA276E87E4C85A2607441E52537DB089C63A580D43F03568
-6197B85C7E74DED9D79A91166245A8E53F483E7280D32632A289CD36634EFB88
-A2B0312681207357626DB7B9E3BC8FF68A9B57B781624CC2EA113D6A52C732CE
-516270191CFACB8F0074C160B2FC703231C3D4A0DCF5DBAE33B706E31A25CF78
-7E35B985D05E5D449DCFE75FE74E519495BAF2A65D179D3D18196C7BA237365F
-08D2A398429364E9EE56DE5377A28B11AE28E02041ECFF251F9C922F2A812FCD
-B587912F783B3F36A48A079B930BF0B3F3342C6C829A41F9C61D65D72E5FDDB8
-A2B925D0E68AF6E969C54F0CD3FC764D2B9444BBF09C2EA1D6E53C51F72EB99C
-52720227BCF80215A0FC71F453CFB1BA34B6168E8949905687194168E2825D38
-3A296122AD2AA61DF3EEDF2D8A778070BC8CCCF89D9BF92A47A29D76E5832907
-638BBE1689924AD5E9292726300E5374FF21BD3F460F15EBB8B971ECB356DF4B
-5923FB10B677EE4FCC17498A44E119AFECF07F52EECBB7A09EE9E5E71ECE78FD
-49FD299DBE8D4A381D96D8547DE7CCC235C4026E4E30C1F3DAD4A3E47A53217B
-95BC6285CE787BBD62DB5CD545E3CA96832E21C57E912E718E1BB1B8ED4C182B
-4ED6E6BE789B666F0E167E2200C056EE11F50146F3EB4B18067551FAA65BA2CF
-35A4E0482BEFB17509CCA233B3A69F14B82DBBD9C22377152E913C34532E82BC
-9F304C531B3AC32D0956C520A7F0516B4D0B294D31AD0F31B506F4B5E57FE4BD
-32205CACB2605BEE33352421E79A5C0FE089EE3EBC3198DC157AAED8B8D8D9C3
-EDCB06BE895360FCB7C96BF078100DFE97263BD1BA047534FAFDA6AA4F349427
-2049781B4D3F4EAF9C324E6B383448BA7A5863F83A27D0241DDAC2F0E54D46BF
-A6937AB38744D515394B702245B4E133B9D839D7474DD1AF70C243566CE2EFD4
-A2E9F96F4F828B5EFA48EF89EF801A4CD5FAF790DD8F83EE6966700636D6725B
-911A1353727A87834B7FB91C66ECA1AB9CF110DB1D6824CF111FCA4FF54AB65C
-8EAD822F11667A54986CFC03292292174887B55B27CAB5EA16F46B393A3AF253
-D5507E766A2E21A8C9D36C3AE2A4CF0D8804596DFEB7AE093BF3A6094DA80257
-BC6918172D2E3CDE44D64CBC082956DDA9D5E44340C03EEBA35D4EA21435D935
-0B0393DB1BE66733CCB58DFFD98B2EF3702218FA908C91AB0F45D4395F8B86A5
-3D3A7960305E7331D9436A41F1259FC7EEE9294875DD4504B1C5039597D8D57E
-E7F238388CE1AF8834DAD635760D4BF1D98AD023A7C47B0998FD0576EBCC5CB1
-F7AFD52D4174ED125B5C40E904EFCA544DC1C79C1E897C545A48A8FC9783E5F5
-A2402F8A7548AB934FD107E63776442B0353DA7F2533BAB97F342FA42EE2BADC
-32DE8520CC3C9C9235A7D55715527EC8761EE7C2143589684B5B12B4CF38E2E3
-13DE97D03B5FF43BBE3DE5FE94130B085992A0EC322112CEADDD60DA3A075A05
-F2BFE8BF9CE3B4EBC993D6CDFE3B8EB75065286397FF14640C6AB106ABEB773F
-63831475D31E7BA92108CA7DC3E5A2859B20779044AF8D99296CD1BE362540A8
-FA6F0CD74BADDEFB530B5F294019BE157CA6968BDB97C00532DB86739389352F
-C9D6F02E201D0307A5BB72C321B336DB5250CBB1042BAD9462C337471FAAA6A8
-C75ACD9F3829A1FC8042AA6A0E4640DBDA17DC17BC28174CD7DC6F714657AB24
-E8A364AD9EF93AAEC79F6C88FD11363CEAFACFEAFD29CE426F9016DD0D3FFCE4
-6787EF6C73B6DAD0E0AACF3B4C7B3FAA21E6ABCE10A6C77EF9DDEBA18B86189A
-FDACB87D89C7DE5B6F007D2D886CB91CCD814A74054076ED61779957F878A707
-8F23FE16CCF1F3D4F03DA5188DB3C86BE4B0854C6B43CFE107F02A1C4FC6E211
-3698D6E345292701FA78EEDE4EC1A7FCB2519FBB2B7793C35FC597A24C398F8F
-7778F6AFB0691A987F65E23912F5B7A56C0D58859EB49313BFB5237B7534FB7E
-32EDE24078C8D01D6B2763FE80E2091B2D5370B7B993DA081DC875F9E3ADBBA6
-3A7CDAABB144133AC8D20F57EA85F58D1B7E72E773B24176C9184F8DAFF97ACB
-D53BEC72B33670F2ACCA99724FC57DD1037C6C00DE7BCF6DBD32C2800D15C1FA
-FEB6F051EF41ADA2F3F797D883FC87418DFC9DF3AEB72FEA8A4DE63DE27550A6
-759D7844CB8871CC776EEFCF2CE05493847880E395CB4F64FBA2A1D3B145718A
-88BABD797A6154EEBA8AEC4D18FA06419D43D12E0B439E560E6DC28FA5E3E5D5
-E154937668F60AEF7F1E0BC67F303DC07FC8D62B62E8A423173D97119C98FD1D
-3422E9C6092E964B5BB9DF70E9E4E278EE880D1F0CCA7F099DA7D5687182CF50
-F6C71C1F5FE888E504929E28F5FE875E86826ACE3E12340D6D9567586B290745
-9F4B8F1920EB0B6ADF80FE64A68CC6A5E45D6216D85DAB27885183D8BEFB8AB3
-34698392036C6D4FC06E57BCEA8B7C356131CC2B0EEEDC622E31A0B0D6450853
-BB473C3D4EC72A07B4F1DD4E042B673C33FCA0604E225B5B7AE9CD3117B29102
-A4EF91089B21D067CDD216DCA396EB26D3A93354B1EF9480ADFBF47302944B8E
-689BF2A5577E685DD676900267F27D1F0D909E028A8230F1E78D0A5CEB315613
-7BCCE783AEC76A00528495C39288912795CA29E310F14D0254EAF189EC9F6B50
-DD11C600E830E8089FF6E8551D922108ED658D7532924122B25779F6249574DA
-23335811A89F3F1BE93397BCBE567DA3FB55EC17EBF96D17351F2E91949BF461
-81BED82C96F3A8D3218A5ADC7636D91F8BE8815E2D87747CEDD0E2318114794C
-5F9EDC14F93A499036AB8F86D87D8BF69CDA7D7FAF4D7DD01B15D0A65C97635A
-B519714DC29C3E36FFDB7E29FB09BF477E32BE84816DC51182375E90AB1DBC36
-5E4D719259BDBD2A2E9DCB025613E537958ACB83B7A86D23B70CB104EF925650
-F5DA43B2A18812F4EBA0AB8DB6351BF489CF0A32511D4A1879437E3C226A101E
-1F33FD0F1A5657B51B636BF520BE37193F2BA020B3DFF82D46462F98CB967589
-90DA46A5B65F52B78DA019EC900FE6CC2CB727B8B6F3B6640D49F4CE63A52624
-A2ED29D4C4A28C7B1D7470092EDF41101E6B628E18DD125773E7AE9426A3A529
-FBDD996A2DA46A21D720F2F49FBF611DBE110D2678D585115EDD9D5D5C22E4F9
-7F0E675E3023C23EFAC7D025DBF6D767A9012AED3418B583A55D565B5989A17E
-D45885D63D8CFBFB16FBEDE6EDC39D706D2246483E21D63B6E43E1878F89853C
-09C710D4F20F075E550DEDC0FC1B728E459206168BE1021125DCCABB86087F2D
-E6F897157BB0FB6824B33C511CEB1DBE4BDEF507614B28AF0A59B028CCAA91FE
-A4EE8A00821BD66A3678A4EB6C09A17BF57483FDD188645E6EAA31621CD5260E
-54AC3512EEB1A57C4DA652E89C3792689724B632441BD194B68D9AF88E29C7BA
-77F888E53B981F6AE9F5515E6D8A968619514F62BD91BD6807E02CFCCA694DC7
-CA9316809A62AE5174775235DCF9BEFB00592F1FF418499B3FECC4E42F652103
-36C015C0747BCAC97E12C8BD01C4E9D9D4889DB534E0B2B745E35D08691803F1
-F622D4DAC08C124C2C8F4A111166C0481C293E7DD2619A3E5307AE41EA7E04C0
-F55A7EB42F83BC3BFA8E8118AA580FF426C75B52EA68D34AC1A2F3FDF20CF272
-CB7A2E6246DCB25F3F870E7440A2520B5EAF59B61EC9FEDE3F2F2A79AB4F3DA8
-D3E9B9B99513FFC2C1B9555EEF08BC5570B6C1A046795C4CEAB187105607AB6E
-A7623709DDE1E087F071105B611CDD52912F3D10EAA9A4BFB5B77E75FE6F2BF0
-458D283935100D526A913FE631A7C7E54F1CE6097795517E83CC396807ACF701
-5E2AF3C11A75F66D27DC1E84820428B9FAE88EAA0CF06C0F46A2518094058431
-1546612C37B6AD9F91449FB32BE62AB65C32F898D5F9FD416ADC59EA35E306BA
-11635BBB6361D5378232B80D18BF45B5BE8C6F51F4A2DF04DBF511A468F1BF64
-F1A2EAD1FBD42EDFB9B35C8E53829E6D39256B54FFED92CE58F1F9695B073C27
-A51CD4EC20481BB25C6CA4081CEDEEE63FE726B8EC951A41FABFF83A7F1C70DE
-FAFB8D10522CFA6C33DA23CC1ED63C1CC25003120BB9F3153553EBE6A2870BA9
-C8FBB4CD3A6ED75C1D24E60A2553E618FF546128BACDE6DC59A64B812DEAC61B
-7606A35FB6F06EEC7FDDECB36AF0ADEE58F41316346D863CFD8E114F44FB9EED
-950D41B8B1D9C9FE6321228CF171B560B8B129F80EA04A82B731C34AE9DC269A
-EC08729BBB2824C1451EEFC851AFB32A5485A035E61015488EBE3A5354FF7951
-BF7F795196542F152AA344065C644AB515D95F1DC5471674E5EB3BFCAEBEB97C
-F4D017377E3A136C63EADBAF7D4729FE78A82ABFDC02AB7DD4A49B269AEDE26D
-5D04A0593A19E626595875789BC83535DD71C6829FF46F59BB1384DC2E6371DF
-3E014F3C26AB00AA55B4CE9B93A645D4990CB2B32B9DD6E2C60D3FD6CD3D48CC
-C662D724F7933A1C544B9C5F16C37FA27D3E028517A687FF469B5376A8EC5C9F
-6156528B841DE6E4357CD98F9CF0363000573026FD561E1E7EB6BD2164C7A1CC
-3032E4386A942085F76284F63F02B9FDC1B6B67463B36DF7FB39A7855B791D1C
-4CC9A3A2B130711E646097D65D9F3980E432766C422B5470F1A281D167A5BA2C
-3C15F6AED61CD52A7A12167DE46343604A2C24524AB64B360AFDC5DFD58DE801
-408055D36D4B314A80A66DD7BE1116EA32BB3C646A2EB3BA9E4ADEB587312C09
-44292F8F328F542E479BBF54177F19A7BA75562F5D36E7F9641535E9047E99AD
-A579CF75788080388BC3CA8D2789A86A7F9FBDE90E8D9119DDCD2601FC8944C5
-855E13075943D2FCF133CE3EA0239624D8678DDFF50F1CA43F4595588906B39D
-F0F8E92B891FAD86830D1127CA2EB3E81615A138B1F06BD4B59FC4DACE4ECD84
-ED9D41199B1309CBD5D498C18ADFCEF1F24B85304F54925DE840B4474E27AE9D
-B4AC1959FEA2110989D7128076138353B81C08F99F19CAAE0B2ABA49609C95B9
-977E3A62B9DF6F39D245EBFD902B245EFA2CC601864F399D4748C1192B0FCBB6
-9A2BDC9FEE5D20F4E8415EDFE4800D86725417CEF973CC1D242A501B1BBFAC3F
-E66CDA3FCFFE4474DF22648F56EA12FF1F5DF4F84430F2F5A787DE997CE19D36
-081B69E41897AF30965733C4064D8B664046940A735F7E0BCDC0F1758078BF65
-5B0562B7CBC32511D668E8B270F61DE04C9E99D7B2B6670A048E973E53096782
-9B3566BF079BDBA6C9E83ACA1165738C929000F8C2A849D1BA054D2895149FBC
-463679A22F07B6E8E1F5E38E2A8418384853B4B7F685733716F42D49935073D8
-6FDE1AE59F5A0A26EBAB5607DA830C585CC1E8397872ED1E0FF20A7F526FFA42
-2193C1316CB7798708FDCD9E25138064E46C4EB3362970F7C8A6449F1C557E69
-F42F18E817359EC26FD7590199FB158B07DAAC0DFF4D6A55B5AFA1C3707F81D0
-BA0651B21F633DB33DF01FD605545BC99BC0CE3C2C846F47DDF7A259E0754BBE
-8BC9FDBEC590EB756997F26C1556CA2249FBC9E56868A62B2D35462D110EE04B
-8AAB34FE27F5F3A495FD1ECD64E0FD0679EBE6604F8E00670B60A229A29D9407
-B3554892E8239F92DE2647FD08B39FF2662369BD5CF140562AA3AA093F5143F4
-E234A7D47DB543ABD141B026792056178716D13A0CD10F830E008ADA04292E32
-E2324E1DBCBB84ED85D10ABE559BE9F13F343FE03052FD170A0CE2FD5F34A9AB
-B81756931C612B54FFB7C48B8EFBF352E67A8A2CA6706E4EB29D402EE393F126
-1857F04A371B8BE53C392C58434E3250B40D0D58AAEE75B1500F7A02CE82C4C6
-4141DCD5474BE9E7ECC08F4724A6508B40890CCB768817174AD09B8CEBD087E7
-E26F3A57DCB97906E1C4AE759DEFB8E5B2CA22485735603DF495B087FF8E144B
-F590AD3EA1E4162DDBF5A1D0E1C5B3989C995738A25BF8FB57ABBA26ABEAD61E
-6F721C323236F71271AE347F880CF434F9D47FEFD2A56C190B26F3CA707933CD
-98EF706460832D64B6B853DB3E53363FC62693FE340EBE8F03A38F4668525177
-B3F3F787B8476D86834FA113D4940F264922952353518FE7FA75593992BB7198
-5720CD02B9F0F9EE7E854D53B85807334FC9EFC84868BD70C437B55086E8EC8B
-54C10D293C24C8FB674C65A36614A686D08EECE666928A10F29F26AF6E6B603C
-0B230840D087C62CD2FA5377941C7D4C1A6A14840243C8DA1ED5E1FE7292D960
-B9D610F2C027418A23AA23F5C68A9EBBABB3D61CDDBB1D29EBCD13C0C591F2C2
-7230D296654674BF1B6547AE0E055DBCEBEBBBAAEA6203DE45C18B7DA973048E
-DBEE43181ACD15D47341C8D173328A525BDD021509A8EEF2AE8AAF3B87B1634A
-D3002E8F1BEEEF87F9754B58358B7615AB339565AC57D38A894C2896D235F5AE
-C7BFA18C7FC1931C7FC6AAFCD9800AB858FAE8077F2C67E435D943355F9CB4B4
-E0BBB2665441CE3460EFD9A98F40CF83B7F46D35AF353EAA542CC2D5F3EF8BF3
-10D5A5422F4975082A24C769CACCF8A787B344491E3E4F6F79AED993627B44B8
-AB47398C0478B42E67E8799F33FC9278A545359002E94F19D01AC465BDEF5666
-2CCAD2C2BF89521C1664B08616B5F12FF470C14488E783C3A191547D6381252D
-B48967E971CBE03C9BDA3387B36BA3612090F755F46FFAC5F91247BA7417F374
-2AEBFCD0C91057AF11DEDF31797AC1008A586429159B593124C8B71EC87C16EE
-D7840A32481524A958DCC60D989A9E387BE96268611C1C54AA679B279A52F993
-32D188253ED0DAB9F7C98955E6118DCACA7CE701BB5D1CD5E70D0188C0CCE8A0
-142B83FC90A97FD06F2084234C078CB926A526B872DFDE42F5ED8508E453B12D
-045277A3E76EBA27511B4CF0FF6FB3B4B41302DD5E2E25760E30B8BEAA3ACDEA
-A2D701C039C111A83A46DCD201B947F52F25E1047AF10B5325561B8BAA0E7564
-DC31D8E8ED2A24847A146B824F2F7798E4461ADDB4C5E75DADE1C253DB22D4C9
-9AB28E31E5733B18E42B055A420D77BC98406E980BC92C77A3774555A1693011
-D0D22163A3D0042D2F8DB77722AFDB3403736F02F04DDE50CBDF379F434A8468
-A1E3BCCE78BE91C08004995477A27EDFCD93112678869F9EC08409B3CEBF9A8E
-FC2F9B354A48713B4E2B9328F50C0090C82A06D04576A763849DE2479E5ACAAD
-BE435CA9D4D06EAAD43B61B9CD7932CE46A69D6793D8FE7C245CA0CB4BE77059
-477C447F6FDE0013AC5E8C97D5131832ACA1B50E853E465AD8C50485E4291624
-1BF809A7397F05AD367EA3B7A971E14DD43DC9298BF52567ED56E189510DB574
-B5A6F70D7DF08890DC5D837B6A2D09BBB708F7A868A39EA54E733D0482FA9544
-7F807644F3FC336D78D22EAE12F48254753EFEA3B31F3090AFF572D7F3E77B5F
-7ABCBA19D7D9C2EEE8ACA58C1E1770DD151E01EA0DFC7CCEB4141A00F85B5EE8
-18461F5A24D4E4B8B7F309F65E974C7F715C1CD466145F5A870F2F424CF33C13
-78E39A0430CB4BE748BD72E880031077F04EA32ABA3D359AAF79E225B41ECBC5
-A9C2944D5267D9FFC194C547D05D92A5E89E143E63481013B1B346260EC1EBAE
-7BE17AA72035DF86B62F46E3849F42D43448BDD4F91DEB4C3F859B9D4E937CBD
-C4D25170D2D80CAAB1CC0253731252CC051D729A6CD87D39C1EBF50C61D9A575
-4445F7F5E51607E97EAD6C933FF531967E6153181AB7D323E42C2CCC78803E2A
-DBDB113309B5D75B045D3A5D180673D8917841CB9DC54EE19721A3AD436971C6
-DF9DD9FA78238D37179EC2E7B9BA528C485873F99D209AA53D38084B4BBFCB7E
-C559FD3F939BEDF5BB9A75F11D2F853285E2626C0C6D79CCD2DF4486FDAD3A2F
-898C348F4D3C6C29BAB02E9686C6DC99DCD203C94B4E8869BAB8083E62D7DBB6
-22173A97B3481C144B95134419188E297D2521223464418C83752328FD6C84FD
-F910E26F8F20918AECCF86E937D69C708B4FBA5B94BB1F573274FD9EE6C2F26F
-C657665EBE9ADA23BE2D4949F52FA4E30A3E9400B3226CE24C4D30807E262ECE
-2D506BE02FDE8A0D4042F908324409E608F45FBF94E7ED12E99D56288A305A94
-7DE50958BBC47A2C7043F560F591B5AA209376AB2EB3E59C3C9A6748E429412E
-1823CB5F64D80A93D96FE073F8507F07787499D1A439F2000604CBBD63DF31ED
-4C6CD3915D933D0F98CA90FC983C29EDC92B7DF08334E9772A31683746DD4C9B
-CF460446DC8541B503A3DD5EAB9E88107587A93092F201DEFE926F41E035F09B
-CFA90B81E97D8AE484FDC96D5491574CC9884922176D121A3E274B94D239CD69
-6D545F87238BF05DAE40FBB7671BEB2AE967DACBAA528E66D57C5C8EC554B9E8
-972F83D668216F336A46C0FAC6F066E7776D199DF204E16D8E3E293882716BEC
-B1DC6C9866404A2582D8A9D23F3081EDA0EF3731A8D94D8069D589EB4744B0EC
-4866393C30F5A11AF6C0A3F48E7A5C1AAAB80CB6E20A84412802C2862AB121E2
-71F3C96A25C43C08DABAFA7C557DBEAF679AEBFB53B81D3A7E55710AF3860559
-45932079CC79BF6123FBD852D62C41B049A9A560226939F080E9EA5C72EBAD46
-EDD8390B57DCAC3B55A45C40CD0AD2D521C2BDF299899F52125F78B8477E6953
-DCA76BA5E2F7D0AB2A29CFB258573A3CF80998F3E6333CE19CEFB58C71D773E0
-C9C96C0C52DD189606B11A8128B97CA631271B28CC49D88070825BB5CD6D9CE2
-01BB269B0D0010845BE00197F7D0127A32602DDA051556B006DE0534B351F8DA
-8728E60C223D8B759DEF450AF14078F4A393077A68D8B656F0ECC756D4D495E7
-AC0090A6C0D2C25B0C18D7144AF78C083374FAF761CDCD8E27044BD090A397CC
-23025AF4C76C1507205EA91DC41FC1E660010AFD85F1DC2668317588E77F390C
-6F2BE6E87E64F979C259EB35B9E06ACF5E86EB1EFA669BD9338DC1544221CC77
-7EF9430DE3E878E7D8686781443CC7A11F8DB43CC7EBD5743574E56DA0DAA6A8
-FC799ADCD91EBF7D279FAAE08D5683E0E2ADE9C2D1C9C1D35B354090D17BCF2D
-9E16A48B1668F90634CA41EA3A5CA8D20ED0AC53022B3F1F3C9E17A02C00F379
-BBF61D1FF26823FF394BC9B669EC8A32D8C020D3C95AD058EBDE1B512FB8B6F5
-4645909503E6D8F0CA833C911766DE63D1E06A7D4DD37B6FB3EFF5AC003BB759
-5EF311D5B8930D775DB5C4F82E519A28488C93E011E22A468E268CF139412DE2
-11DB62A7748F9A643E4DFB264DD81A9509DF461FFF1D350396FE190DF9529224
-8C47FFCA391FCA5734666D533DC19E7F41BA0E3F7641681586FBAE859A50BF9F
-EA343866CAB65326676EF5353273D42A4E8CFF92E11FD0FAF9E754547D2DC133
-1C5A676EF2B6647119CBF8A7FBCB965056D732D8EBCE0EE11D0D37B6625B27B4
-388D1DD60D642547BD6C5C6FAE9A72F4E68DA46757B662DE726985D46DA3215A
-628B0128C0835685588239EF638D489FF9499DAC82F2144E361EB8FF5CCE80DF
-5E1BA97782FA5E81821219387753CB8EAE7EFE65DEA82CFB784469ED32DF6E21
-D6D7E94392D8DAA5C62A88E0E7743A34F2C18BF01312B49C035E915E7A317B82
-B59504CFEBDF35DD368389D0C89A308843AB31595669E828463E26D5D6E78630
-8E455D9A6C3EB58E3F58056FA0A30CA961675B1E40AEEFC8F310314F49C513EF
-ABF5101F59034D5318C1D9C70C3290434B65FD6D3148B8DAABA24F517EB3F070
-0DE19B389909B2DD5BB43BA3F6DDC2972B40A4DD13C7599C74AFC097175A05E5
-F2C307A59DC48A9C15354D57156ADA9009505A602D77C4E7AD4902D9B606B520
-52BB66B78FA21683FC98259E6A5A9E6027323FF2F879081C6465598E848D5031
-24DC83B7D18AD3BFAED378AED4F17C6CCBBD9EACE31B800E3174ABB020E32D48
-9CDDE69D160D630F790157BF4DA87B14151692DB846C1D96710AA7266A483346
-F7060060F10CE583F407B7430BCD1D5121FC9C270291F993538BC10D7A5F7868
-D7D434FE795AA707A63874ED9668F27F101A701BA9E43077A2EA1B7CD576CFA1
-B614BD1DA7EF3F9B0EA0AAB021B53BFC5D3C897DBFA7B6079EE99E66346B343F
-140A350F1B9805485A30AB93486A217AC0CA663E654E533CC9197632A555AD60
-2B60047195877B3513FFB99E895F3EC3CD0BE0CF08901AFC3D79479C9DA36E85
-1D6DE801D3ED1C34256011B2035C52B73D98B8F12D707B876D25FB09EB5C1C02
-89856EFB3D8080F00922F338EC6FBE85CF57B160CF85B658881960A64CF065EC
-B32D2BA2A1FE235C1AF87EAA4373F09AEC05A1C355F4C57E9259AC2BA4A8AD23
-2E0E3989DD45DFDCB54336D1F249650ECFB21433FA11A14A42141ABB516E3D85
-2887A97334AB91E4134576A74DA397826F6D4659F388F7B722C675BCA42C9338
-934F94B6321CB3885FFA7CD4C7A96E9D14E5A2A5DA68C5B5E11010EE38444B1F
-30CEB6F0410EAB6EBBA097E482429763214E4DDE0DB2C004F735B032DB3045A6
-459DA48453CF6EDBC47CE46609AE01F9EC5433C85608B7D3E1E890E4A64CDA6C
-BB94399EAC00F06908EC2870FCBA4044F93B016C91C28349EDB7C91C92236D4B
-5347F2408F98D684BA1FC14C27809DA7DDAA414297DAEBFACDF70BDF412100C8
-A42C35797E48EFFBDEF5C2F593470234F75E3B0A4EFEFA74FEE6090B884DDD5E
-EC0CA5F53E47917BE27CA2FA1054B232CE95A2CE2E8A70610FDEF00B38F03970
-3A00FC6C909CD0787D493EB5946352BB90F1C041899C334F7C155CD9B76DDBD1
-221FE505EA179D91727B44864AB6DC5E5F48DDD018BB4253600AC4D342CA65EC
-D60A69959428025811042426F7059EC08EA28095BFF175B7A6ABA8BA52E88A32
-E42E18DB45D00C7A4FFB0BEDD837BF8049BA57DF31F1143DF780277D23C1E197
-3C59A001A97EAB93B4431906E598F0822AE35713D21645B43E13182EAC122EBD
-2DFB477AA508D4184085BFC22D1FA6A8DF10D9A916E6179A2CCEBAEE35490CF6
-5BA6BE437D4D8EF01CAE05FB929861D2BEDF3E9B0053B776F4402CB9D063A71D
-E0A1CA682AD69A5D9EA13C86997A779861EA71730FBEE1D9A4640983AF02B703
-CD7A85F0793C07EBB57FB9631A781EB54C8DA8ADB872D6A32DCBA78FB0AAF00C
-D893FDD8E4981145CCD80A14DB6FBCBBBB03E7D23D492009B98B757F0044553E
-BBEDD139EA52E664EF2A1D4531D16BBEA5EA29AB6491CBB85263B8BAB6D446F9
-F67AC3A247A29E4A0B081C8D811FE057667DB23F94441C74E11E7AAA6D9BA4C3
-854EDE23520C9C4548016DAFD3E791D599D94D6D61BB218BD00E232DA493015A
-93751B5EE91F63F7B08E72EB6C15160BAFDCCD42D826AB7FD8A992555BBE5A44
-E6FD0C46DCD45FB959CCCF2EEFE037176FA202416441C59CF5A27D8354427AA1
-67C15E6F2E90B55B3C46B7B0F1410B17BCF452948252AD4C661864CB6CC39F03
-31AD003356A4C7C92BA73804C28B416C836D8D655790C53D3818E70C62C38D48
-6FA6C6CBA2ABE8AEDC125C8541B3B1FCCD73F4474560F5BE1A07A7D1A04D5ED9
-FFC20BE392021C08442619BAA93F499D6AE85D70F787BA03434DDC7B800D8146
-A14496AC947CD17252756D40F0465DD2D9161E344936C65A4CAF63B5C8EB9E34
-ABB1A6E2B6A76F7B91CC1AAA8903B86EF621F76E7606EAC8A8F0B63B704E102C
-98C4185D33007D1B98246949B8BEEA380613E9B81D3E2FC3F894AA4F4C1DA876
-62E92D9FD8589A5C7A0E9D4D28733C08DFF7189A0232A8289FF537376AE13C08
-7D7E43CC83CE9DF0D6372A075AC8063CB89AF6EADAD6179F03F5D3898DCF51AD
-0D8833EB69C68C0D6429CCA12C5E2D9182035B3F771A8D7A5FBFD40A44F12351
-E3F42D3A5BE0FB4D0AD2E899D289127D8EB4D8D4030784E884ECB9FE60B9DD9B
-31F5190BF95FD48CC1CF0E50E61CA832589FB380F0AF14852C60EB4EBC0179F0
-455F3F48433DE6CFC41A89273B628219E57E88DF7AFDC72414AC323B89926A5A
-0A06E29FBBF7EE9E3BE5562CE995096595EFE5F6CD7A2CACECBF2303753B8CB4
-3465F3922D3E963CDD093688F57330254883BF082BC72116ADE2D8E750992458
-47D8CE7A1529FF9983F6CD56A7575F0BB34AE438E6ECD37EE83D951A356B83C6
-AAE7234343325AE51BA0AA1E517669AA7B662C09A55AFF9910201E9B47C45B01
-DDB755242819FCB31941359CD47CB9B03A162C719DBBB92A4041B71B8D22B10C
-597418225DF3DC20044D7A7FF360150AE91D9F6770BABE3D15B0AFB2151500BC
-FFD6B5DA992A4B999A4E9C9460B76879998E2D4BEB467026B321E156B06716A1
-2C242A93F2239763CD4541C9C6AF7F2E1F956B9A484B254803C85B29D7543D20
-E40C07A636F07436935229401B071955A6C722387418F3D99E3389FD50ABCB5E
-D61A9D0B26CCBD6DC47B8377C078DE3B0DB9462E0B1C8040B92E1994E44B5704
-425DD3348E5745B29A620FC3048456AAB6A24800CF394E13707B6FB778A0B4DB
-1923DB961A83643CD1E70B5701C56564E061E2F46F9FA8C531BC01D01F937BB6
-2C4FB758B07E60B48338D26AA856702E68A92CA42AB1BFDDFB7953FDAF8133CD
-AFCDC4D995020706DFB6CAF3E07EDC4AF9750E3253CB72C00FE6AF5765A61F39
-4ED724F4B0E4459B678F7E8CF774C7AB87AF78E38615F23ACC8EC71E0591B71F
-254978D3DE271E2C182FDF190809E6551E7606C78492A7BA274DDB0CCAFA320F
-89ADB50F35734028847A5A09473EEF19A11FF5597FE05A429A3C8DD312130032
-C4D64B5B02DDAF78A4C08C00BBDCAF6D72DBB7B636E4A9403E66A9AFD4FAE520
-A96367FE821B98B497AF9B86F31D90ACE82DCA3EB3A6636335EA4061E10E917E
-BE2BDD1CAC5395B4679A7ED1E7319AB670CBA366DBCDC8FC5607A8DE17E59E44
-4E700E43F88C00B1EF4BAB74CEF90A9095C1B168F680E550CCFF2D480C070E27
-6D1347BEAD1A40A57CB502339C9827354732B1986FFDFEBF48160453A1F559BC
-F6E83A71523A3BBE399DBC0B757082BE6CADBCAE340EE1331E4755D359AB9256
-32BF4E2B1E3BBB8EE25F2E0572807D082ED15829B0CCF054BCEC1378198AE033
-5802B209BB452DF331A8EC46FFF63358C7288B7C0F20D6FCF54398D7BCBB1493
-84217642755C6A8D56467866294B5D7E4B2E760A5075A7931F63DE69CCD47FBC
-FD845CC09093DB75E3ED88CDBE9298089E6A1E663D934225B0023ABF54E95D10
-F614D3602CF4509215683F5B9773ED0F1EEA41E17454CF8503AF1BE23AA251DA
-7874A62289A3983E6F95444B98A35BA3B8A45FE375FA58BCAEEF768EFEBD25AD
-117A393B999B2B217C66EE4FF70F8A91B4153E771E19AFC195208215F9502DAD
-945201A987E71FCC93B5B27976C77A53AB5F34CF1A6D2F2A4C8B3CC0941ECF70
-791BF425A729C9EA2C09C54FBBDAE3CBA84A89AC4BCF397EA1A028F5656DEFA8
-43FFF3553ED9D8FE19DB02DB297EAE11DC8D88C2EB0F1B89904537E99B360BD2
-0BE004711612CC9CE6F2BFEB4B8AC1DEE1079059BB5C5D6D5C19659988959053
-D1B4E9321AE28D8E7706929157078BE75D1234A03DDEFB8E636A6187703BCC63
-FF7FCC512EDC737EBE5AEED7D6080F061DF3E11664F736C22D88BBE00C61FCE7
-BCBC47AD3C84146019EE40FC356F70B68E05669879AEC46F561E891847EA5E80
-16562374B1565FCF6DBF4DEF8FF6A6D5D67B09FD32487B6BC502F3EC1533CB39
-A9BE9D7BD861C1272D48AB737B1A3B424894410A48C810447252ECBA3F738EAD
-C29AFA3B3E2C150AFD5D5BA383EE691119F0B04C16FA47E1A15C0D6694FECD90
-3E3D710D92D8F623D19D6F13F87DF43986A4A3ABFF6952EDC7793A94933AC704
-AD4ED8729263AB7450219B0BF0A83B7FCA0E16DB6A9C249BD77E49EFF7EF1603
-4D9E34ACC2990C7F4DDB992B2101828CEA1116945990B0AB6750D72A1EF77409
-04930C8D7381295F022B1835EADB9886F5ACEC4E032303139719FB0B65E8DB0B
-BCF2D520F59F3AA73EE4ABC2B26B0F0C911A88E9FA7691DC71D3ED030BE70CC9
-556B9D0D0F630A53008B29C8ACB54341178302F82D52358FC75943445AD091C3
-CB5893B1482357017AA5A68785AC8EE74DE29816B1BA3ACD8C715411256A34D3
-AF0F727E32EDAC4EB9B929EC85DA20566902F0EDBE49DBDD2D6DF571EE858268
-E76959766C9F890F86FF7249BCB77E0AB1762E4C41DEDC2692A8073992FF5FF7
-7D8FE0EB091A682A00A2D1F3E2C1478337ACD4AA713A0F9381DC407175A09FAA
-830C3B7BAF6B9FA80B65C43349C3083704B67E445BD2F352B055A0ECDB6EC24F
-70FACB80CBD977ABCA4500126F669B117455573E0B7B2876613CA5A8CFB9023F
-482DD6A956F5C39236674BC75B59A713CEA196D7EE20897C89848DA95F5477CA
-7B58559AC776CBD692D7752C1926FFBB82672464B26AACF44F3AC1A9E311FC60
-7C2342334EC63F9E082826600AA2789B974541766D3052AFA1AA42560EA78666
-3C82EDCC89B3BF8F9AEA3E0ACF605258A7D29FB862487FAF82C4624BEA65DEC7
-CD829E1C41D8769E07B6CCAB1ABF40FA83ECA22A5E8E3ECC88CD3079561AA3D7
-F56CAA4CC0C4BE4AAA3CEC37C5752A23CC5AD3684883D1970CEF660084A17E3D
-EC6FDAE4815BA9F11CC1705A7F9963DD4BD0238B8C4BE251FD0B208A6672C465
-12DAFE3233FADF4561FA10FFA9A3996CF1EC24EA5F6EFA9CA0830B631247BAEF
-1011C5F51850A1F05B7E0762B15A5EA06DA454569F30084FAD88A2A0B5D8D4A9
-2D81C477D6E73799848B6A009E52A51CD9489D571FA534D5BF163F338EB81195
-10000C2F8466F1B211CCB6BFAD21BD7E8411CFE75B7200EEF00CDD7EBEFF4A8F
-1DDEEE82DF38693C9FEDBB1D0981E57B49B4EE8D1505ACAD76BCF07E46560F56
-A672F5C4F615521D851946EA0086F13A550BA75A7D42E032910DD366138D58A8
-2716B1BB741A539BB4F2211885E321470C26EBA3156DF3B2135BAF9337718E38
-8A5B516645B1EACEC6E71701DBB86940122975371B8C60D578A3686BBF6B3FD7
-A4FBAAD3E11A6C8A2B7985C9DFA85C082E656C708FF52752A82C012D7A19EEB9
-FB4D90A6BEA4E75B898D4408DFB91085163593C4082EF66A4644FFF02DE50E6A
-0572D75884312C043840C7163D7694E45113B324B5C317B0AE18F2D3D361F4B1
-9DC531DBF5A21F286776E9D39A81E49B93622879450537902F71257FDA210C0C
-44FF7C2706E38C88D6DF57EFCD3F62844D72ACC7C0584C4BFF6B60DB256AEF5A
-73FFA790805D1018D173DA5C75FE525D4F01F40B6B382FEAC93772718AD2C69D
-186CE9153A28A246243D9CD121911557C38B73C6CD3724E9481409B572F0F347
-413AE0FB9150D55679DE7DF297B238CB8DB93DA772F248100528EC959B80534D
-23619F594217262B1220C9E7C1141605718A8E589F967C810E2B9ED6436040A0
-9E204EBC6397C6EEC571BCA43788624296A4179DB3D4976EC6D27B14EEF92349
-6EAD3716721F52EDBA5517EA740322327A62F96D0B9D4D715D64B4794384B410
-2BA9F8F442D1BE31B5C48761E44EB339F061EC3213D4EF1EC6D8F294C5B222C0
-02911E1D61B7D2663255BE13FCEAAD6E665829E79CA81DFD5627E22BE4B91D8C
-839BFB35C7ACD48BBDFFC61A4811A4875061855934E445B60C9B5A965C636778
-888B0E87E60BC83018E4BC16F08EE8891BD3C56B8F7EB4C1B6A6BD11D79FF638
-9EFD2243A9E7CE1D2A492868EB148AD8D3CA2B939FF3CC36557464E71E64BE13
-133946D7BC1DED761EF1EDF4D8524650B9A02319DB72BF0B5321B7D9BF8C357F
-0D8D66A54EE088E9C270FEEAFD68735B046E4CEE851A2D03C97AB895A6AE96B0
-1A29DA9A4C96698F319D8BD1D5087F36D5112AD45A9F059D291C5507563933D8
-5FF87C7DEE8FEDE23D505ED6F0A14383E2BFC7A2B020A8598453B16D2DD38D5D
-A8BB4F0D5A4523E5FF4FCFB19DBBEB5B1E2AF5EE260AC450FDC82A6A92E61707
-2237B50DD36599D476225CBA112763A8A5DD3B1919A91A79B9F324BD30B990EC
-A32C3828BC991F8F43CE31FC202A2690DABCB64F814CCE11309752251E7EE559
-80D162949E7E578498C0338C6EEF3546B5F938D08699711D635ADD67B81C2230
-FFF3B1C0FDCAC4FF5A625E9D56B0BC229E605681E46F18737C599F914DB1FA42
-C6FACD77380689C14646E71F2C5A6DC68B119262D433326B181CADE47B2D7DB9
-214740E622F3A06383234F46C28586121C64B10A5B1ACB8ED7AFCF5E0E653FBC
-D3C5598CC6D21FF5C6BD24C114BCDCA63F8485BB592356115B32998E4DEFCEFA
-D63CD51CB54A69FE5690999F41FA2106A76A27C194FB44568FC7268D1D40FFD4
-24E553F660C83FD34271347E987897650C93DF64EA0F9D41AD68A40908E42729
-E008565141930C48395703F5FB61A99D2B087C065744126AF226CA5EC2659BAE
-AB0A9F3EEBF46796547B29CED71BE3EF5FDD8AC6594F482E5E01C1A4EA33F401
-0CFCA0798A5686A379E8603CA1AD7034764157987DA0901DEFC5AAA57E97329C
-7F297A594169E6A3598C75AA98DF3FEC78AD50D50568DA02DBFDAD9695DFFF4A
-4F88A68F986F657E2C5B7290ABDDBDDE38C80E98D7A97654662C9F19190E1444
-0E7ECBDF22F295E5A09E988979D581313C9B8CC19D96723FB0BAD1657D50FFFE
-DA1CDFDF513E88D869598E6B396158BF9A35F49BC1810EC7CC6AD1C2374D66DD
-061112B679739E3840DBCA3865E2AE5600C8DBEED513F4BCDB0B284E655A2DC1
-6A6E53F78760A4FA927C16B4771DC7084308640A43E87E6B4AFC7578E20848B2
-8F77803EFB46E7E7798DF886E113A37B7C1223EFEC68CF74DD5038CFC927E41F
-82452EB90C565065B9B182920DA7F2FDC0CF13E00A9604B5BD1C51A3F2D938AB
-1415CF0981B8A1ECBBFE6067358E5A480866728CCE529B799262E165CDB9A0D6
-97BAA5D4934879D6CFA9B881CB0569B38DADFA5AC8C3A3146E68B8D250CACD6E
-E1BF0BFDCDCE70485D603ABED0151F454DCE7FFF60C72B532C42B2D1B7C70F35
-1848AC903E659691DF5D05A1FC3F8DC8269A2ACA77E1DC53C22F875FC62BC325
-AE4E9042CD3B9F3C231B8BDA0D4F37C7A84A8C79A48F3D926F5A4B1685B0BBE8
-93D2231A97FC39EEA3277BC29EEBA0CDAC4B77938051A9DAE8832CE9269807E7
-9017D8DF9DF20A500562B6E972F82B99B7081B21E6D444D2A50763D0DCCCEBF5
-D018D9E7561F50F7A20FD012F33363E821FE54E387A194034B5674F376EC373B
-A22F533904D6B1B3539F1BC6737B49112866320385714601584D8E69C4042B67
-71BB7F3DEC4FB857B25A2CAB22746CA62C762CC64B341A435439564895335D26
-D3F2E02948F17BA8533C75D628A46F7B88D33ED5CCB75E54BB9147DB9E567E2B
-29E73361C786B38F1DE733E52DF6997641D52C70786E4524C049194EE1DB9A6A
-2D49CFE5C4A47998E043DF5ECE933482EF1CC57B21FA44A84F02F194A4D7284B
-AC4D4DAE7E51D869D41DB4E35F95136E16149413FD1D3703553F601ABCAED979
-602F094A08297C2AB3F2A31E80985C819FACDAFA757DA43C9BDC811F2A425631
-D288E459CF99F6EF06B16724C0FEC9F2437FDBC7B9C85D55B418C6B8FFE40961
-57D94FEF03B5031B566D1FE3FB0C3CB87A873AAA83A7171B657B8997F834B17C
-197F2083E048E1AD59C265C4CAA03BDD0535F8FE7D2B427F447BFAAEC0BD0D6A
-4E4B208966DC35AA64E3421829069560D287D04DCE2463F7EC261A6F4E11F2A6
-809F98E311E174BB528EC1E6EA4A00C22DD62F6B3419DA8AE72615EE06C98ACC
-5E3E4761B20252EA0AD0DA374306E234B808D13750FD60D4422F66E4720C57A9
-FC981D2FD198C2F51F1E7DEEB22E9E0427B57AC7A12031F1C5B5EC9A026FC2C7
-CB4F7D30B6C3FC5E1B19F55044A44C2BE1E9B622E8934C6B90222979861F1A89
-BE1F41D1E68910404F0E53851B8955C1BD99F92AF952E736E2FEF0AF768B9A2F
-BDAC44D8167A705B9B91F17796BEBF45666F32714D158899CBB6818134829B35
-27EEA46B37916844A4ED6EA1DB6C3DAF66FEF84BC095C904BDA9CE9388E09D40
-80D8723585600F9C024996C01857F44F4C2F10EB24C5E4C99C1FB6BE46174FEB
-0DA222EAED2D4CF261BE9EB24EE0EF1782E075A0ADD653F5E05BFF4C9E1D5A04
-5A821C376579B34D54BF28F55D967702C96A6C5A552D55C614B4B1689F7DDC97
-A940063425E330B9F154AB0ABC96641CA8B494509F72D6B9C3378DFBD88E2961
-C67751A36C59E77D930F1939D6B5861176423B69866E4389B9FD6EECF71887B4
-57DF13F2F86B5CE3F56665E376539E9F1B92256185A61E30A29393B95AE3404C
-E1979DD13CAF1EA6B654E378EDB6A471CD09182F578D593ACD9FBA780682FD72
-D0B45CC90DCAB0D5CAED2EE39FAA5DA935820CF6DE4E77518C14859B3DB3A611
-AF2ADD391ADAB116D038872613C586E58A2E7CE0C387283E9E301FB7F61EAFC2
-2315EF6AE4BB9199B5B30A6ECC7BE93B393BDA0D565CB3B9CF2923F4C6D3626F
-CEC8A7CE3441FCA79BB25987EEC36B78B6F18F87CB9C167EEF297866C7524EAA
-CC8E5732D9E9D2D43792BE3EA5B7328AF20BAAA203F731B5CE600DF471C426B5
-88388F81F5F0BA6EBE6E4BE25C0862B6410507C6F44649521C831E794BF5084A
-F11B3FFB2FC371B22589C174699892A622EBF13A62A5D21F95A11E28921CB346
-2A1A01E5D870664D158C97F177009385C76197231AB4D0E1C90FBC0C5AF9991B
-689BF14CFA6C64E7B1258F4EEA28B543E2CA4E62F2D0A3FD773ECA
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
-%%BeginFont: SFTT1000
-%!FontType1-1.0: SFTT1000 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ectt1000, tctt1000, latt1000, lbtt1000, lctt1000, rxtt1000.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Typewriter) def
-/FamilyName (Computer Modern) def
-/ItalicAngle 0 def
-/isFixedPitch true def
-/Weight (Medium) def
-end readonly def
-/FontName /SFTT1000 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-208 -360 1374 838}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1F7797042A1CE8
-F39E2475DC2936BFA24A71D879CF46FE753E2C63BEAFDC65589FD17B18155220
-1044C366077F0DEDA5BFC03931758CAD2A066BF49A7C1889BB0582A174CE59A2
-59693720FDAA7CA1BB8015F9BD51B468C01600BEA3AAB225F4B800EC1614FF01
-B5B9AA6122750A57EF7694D92C4128F15BC6AA1BFFF59BD99696A942A03329A4
-DA4A4BB6688CF1633E3631EFCC8BBC4E1E846D5B831E795053288965201B6D62
-C485D993C7676717C6F652970F8C71AA5948C43E2613965EA9CB1FDBEF39EA12
-9804EF497008E1665E769A11316D98C991D65B35E667629F1A83377B4440FEFA
-2316C3143FAD6F4EFC2480E093CBBB3B0D57290ACBC802CE585B70BC89FD0400
-AB0D76CA8CE7E9E4B042C6F15C00A965B4CF8C986FC975B41877FD2F7B8991BE
-92E4F228FCBF7E51CD29ED70C5236A59B5098A689930DEE73D114EC6414B19A8
-C51FCBA6005E793F7EF33A6AC89F8075C30DEC81BAB27F3973CF898C308445F2
-27C37CC99307E7D2EDDFB0073070337FB681F73F2E43061F1D2236B326103D10
-CE9957519DC15C5E6123AEB1AD8C87F74965E2326DC9E018F96DB9F031C527F1
-427DC1009F3020BBC82F52A7957E4674F4EA2232D4114834A511BD053DA38ED4
-9C619CBBD8B273A2A1D12D74B161A800FDF0B0B1A8C29D9CB9E207BE22F6378E
-5764E59B1AF384D8654E21B4798087F2B70245683C7598991B7971AD959C8114
-374B2C5C17E2AB9130B642421543DC77566E0658A3230D2443A28CFE4BF80988
-B578C71908F2165D39E588AD8CD668493FCB46571A5E2DC20AB95C1E01F539C7
-495DCC3506D9665B38656B1C6735F2E4903C3D9A5CAE8580EEE684E5FC47B8C0
-72DCA309FC8C5B8AFFB5C5C8813CB052EFF2E73C4A53C193B3888D7F0A43DF8A
-49D4EFBD56A6A7AFB5DB2C47C7A6B6CB3DB7D048B7EACBE1CA0F60F794E41D60
-CF5131DCE442BCA4E670B93B4B89397E91919EF8DF9A36F60320139D158B9CA2
-F8E93C1F0AE8CF59D623D090FCCF6D6AD66E47C4C503F5AD782ED4BA8FD6B959
-D5E5DCF2E781553AC903944A0D64CB893874114823A05F2A2F38A719C2373607
-49358DBC1FD1CFA6CC0B73C6CE231015DFDAF48360371D61B0D523C06678F931
-61CC97D03C016DAF742B7C96ABE807EC5FD9DDDB48BEF35922CB4CF649C3503F
-09911C57F704575A2E3547481E6F365643205C90D1B145B394BAB0B56007BF7C
-C7638FECA128568AF90469201E64134B6D968A2F1E38D20B0C9A9C9873D4D6C5
-56CE0B113B53DBA617C3277F59A41F129ADA297929914BA65AA45D2F0BFC9BCB
-F13C49870D17368E6E655B321D70FBC7D0F1E12D309A24544D560CB3BCDCC053
-D86F455F45E4C4476C08318B70D386CEF4E20CE7CB4722090265C89C158A1BA9
-348730A9DAE214BDA6CA97DEC6FE4167A888FA70DEE5B1CE56815D212539DF21
-21531966A4FD7DDA9498F6710A4716E17C3829CE4FD4877180A3B8D2A1DEAB5F
-005E49E79FB981B5CDAC4E05D5B7B7BD979DC57863EB039C8D9885DAF4095A1A
-876A054D85D2C32FB58A5E3A0F8F21766DC58E46B447335B6ABC0C952107129C
-6D2F7025AC3F86B32F0383A87B3D74498463B350075D682B7FD7B008602477E0
-E17679FFFF591DDB337A4C5CA16CA40041B87E1F0CB447DB5D69790A3CAD5161
-715BBE6577DA7B5642F97B047EF82E199099F4E035A443EB52D755CE80CFD3D5
-180D223C92CC05887A552AF39A3226A85688257A0ACAEE74CA2C60C50747A04C
-E8B24764D050C43A37597B2A807669B37EADF65179AACF71809E2FE040F0603A
-5125CC8749B0792422AE7DD3DE695AE830FEC7280100B7438A5DB747E46FEE92
-CF64E7E6A79BDF0F17F399854B5ADBCAE31AB4DDF4392C2D008D745D290CA44A
-26EB148E00C2331B456E30F9B29425C2E6BBCE3B73DA666D16385BA6A4CF2F31
-031957018202E91FF38129A1DC67101691BA63C29C3A6225C428A72EBBBF5EDA
-19D83869EFEE31289EC203D44D54EA89132B185D5F5010E54AF1B227F9FEE4E2
-953342626EF81DDA0F01CD4E367FB5BD58074443951308885DAAEB9A473ED328
-A9E1117E316216150FDA64CD94A8CB8582B36A070B070BE6573C82584E261A1C
-4F6EAAB676E720F06A40B386A9E6968BF6DAA0E1A671EF99B1D587C464B806EC
-E1DEEF5C791A36E49878E16F092EFF96B6BF4E1AEF672B7DCAFB475E1810CDC9
-ABB2E9415DC4E6071978BA7B86885799F51B86475F3CC24B135F82BA9F5DA055
-0808AE2CFDC476B635511344BCF63E09DAACD30A86AA97CAB22BE70E0BAF94BC
-2D4F757FD2D92405876E5B62CD35B5F1224243A9295C84B5D2CFC66EDADA202E
-F23086E3B533ABF7C79160207D979A968B940908D65F1D6FA995ABDB0DDB8D98
-B31DD25B1C97585581FE1ABDBA264899FD8BB1A26E4C283F7565A75FE0D8F0DD
-3FC02D26B2766E577C4251D4853ABB17909E57392327DB9D09E35E4620D18B26
-A7B3C39D282B768E6D52D4E391FF23ABB06ECB9CF4F2318C5845C333FF05B9C0
-90DA827BF8D40B4D1A2C270E9F7012B8711E6F7285D5241ABF47EC404A81B6A9
-BB2D9C19FB99A2F6349C73D488961C0D203C995E7B4F9D76DC7093A2EDAD2B14
-6B0362656BF728154AB6B5C1F425673B34CA0E705F28A1EDE4273BFF14BB7E08
-D5D985DDAE01532CB7951416B89E3A4527472AA97B87775188ED740BB8936DE1
-867D7C5CFDF28F8A46CB87DED2564B9B7B6500ADBDD6ECA0DBDA155FA928DD54
-11849D2D1EBE4E3590D1D0C006DBED988E33B7D90D3BC021B9530B25897B461F
-6F73384EEDA74A8F94FA5D65CBBF949F0B461AB7FFB7086E252C67924FBD9AA7
-D152C36BFEF08A6FCBE03A77CA2A9B790591C1B6BCE260A08980D4FF46FA16E5
-64810BDB02559E8B90B384D0F3BAB44FB8CD1C47F94C807C9FA1BD662287328D
-D1C4FB30ACFFC018F46AA386EB1C7EC5148AB2B9A2D1449253111FAA6D5196A4
-7C66A781B70228D645BB02F7E34FC5413DF4043D7366CF3B738CF40765F3F0D5
-160260DD49DC31524A88C597DC8468A0097594875138D6E4ABAB99D719EF3819
-CE3C02690267D3DB7A027E2E9AD10EB2377642839F5BF88B037C97CDED504D10
-47440838DF57CDB61132BA4E9789E83139B2250D1AF45D7B3EAF0A0CCF457DCB
-C891C937B5A8590223348E583B708ACA629AC90E5DDCE728DB55A59A2CD189DA
-04381B8A89CCFFBFA86407A133C0550FC35102731CAF9E2E219188350856B1FF
-333F0267B6CB8CA666215006C9511786D8A31D1748622483A20A40492CC4A8FB
-539ADEAB500B13EFDD792DF12A7CC63B5B75FBE2AF8F77EF4A390FB6028AD884
-FC8A25BDF7A4AA59AAEDB2F3419C17C0C2BACDA129495A0DCBA462D58B23F405
-598AD9898017A55E9DBF2F34EBB244773D048AE37A8C0E86B138CB0E2E5874A3
-F32D7D55815DE48432BBAB96BF9C394E36E4551F17BE8A34B9B8DED5E017FB32
-B5CB9FAB426C90CF016B6AB8429D0486EE22E7E48F1DEAABF717F9D092DF600E
-465C91C83961232C5005066F234A334480837D71F84D7A0176EDBF89C7C51FE3
-7A8D9A77D29CA666C46C7A182347BD7837CA4B2868279FA9CDD72ACA8195737C
-7D1AA33274C3012431411F730F8F7B9F42B371DA95ED6F871F7EF9D23EC7B1E5
-0DAE5204700DBBB0040E5D7EF576D995A6053D2F6D7B66DA87A1533DB0EDA641
-E24CBBB11341F56826B6E811AADFCC865B260D204D0F9E6863D0A5BE19FA101B
-88EBFC9AEB25654D7609FD9BDCAD47C282AD725F2115E4FF0D00EFB74ACA8AA3
-1889A372F349A80E6AB44D714042BE5459B26B502AA27CC38AFF357AE6A53900
-2A6F111DC0E1EC2955C1741CCF689B9936DF4BFC4169E55F7124D503B3FC8CAB
-5BC735A8AC6CC6CD84B69089EDD9D9E9D4E9E1DCB2C2AA2FD0D42E5D595ACC5B
-377A693D547C54662D56705BD350DB066AD3906E061403C4ACB7D926033F767B
-7CF04E1878DEB73398289AC51FA285DD573AD8351FF5A2DF77B600F65C43FB9A
-1170F87A7B93755951DAB75CDE41C9AB87FF4A3C0642DE3CFDE50FF58784936E
-CAE75AB6621737D0038CDBD5145F0FAD8F48D2617C371AD2430706B3533DCA6D
-53423007F10788F4CA8EB2E70F6C7F85853C81AE62A672AB1CD3BE9F8CBA6147
-E6650683D3506ADFC6B93221B94ABF2240E2A71CC79A3AAB0BD12641091F0437
-0196094CE0D6A735884B0FF9C7ECFE22AEFB771050062D3A32D368C2080CB82D
-852C8994B9C760480F19C7AB91209866A2DF316CBE4C5F66AADDD91F5566C6E4
-54A9293E6098E23F8754F16EEDB301F732B2B8E0A0BB9CE60BCF90AF2219C2C6
-709E93564A44AE56F46397C1A13B9B8230B750CD8DED6CEAB6E2FFAA5EB8B704
-68B9C883251C000F8CA08911AE9F92D5C55721D5A3D4251446381F0BE1593DCB
-D61A0098CA8DC95DB7D76DAFD1ADFBB7A95E614F2B3F382C3E3D889FDC79CAE7
-859B778969438652EC9FAB39D7E7229BF60D804CAB12CDBBE899E6428AD036B1
-6894D56733F80BE71815EA32A4464964CA6BAB229830CA86F446D702836418AE
-EB3BABBAB53F489F6F40A677701401FB744D3FDDD905D1B917821BC4A3BEEA81
-EB1E25B8B7A26FF50CEB02308F1017345781971846BBB054A5ED96A85D73655E
-D39839A29A59176CAF28B281CF2D539CF52CC6B6D3A523B80543E5C5BC117BAD
-EE7AF4F435A714897CA1F692BE45D405B31E18DF51010B078F87BF7A118A9E95
-B32BE62AB65C32F898D5F9FD416ADE303432D46C7142AA024752680446F888A0
-49219F805C5234B34324EB8230F9DE24876C85EE6C874F1FC02F482D3C35939A
-D5402B9FF25F128794E8251BAC9DF7903F684121B4E94812780E1B31CBF68174
-7FD266CF682FD125D77501D606D116DD87E53498554C02271DBAB03D03C86F3B
-D362C41DD7FCF07A1BE52F1EFCFD28E53796831C17BD9FA5BA906BCDE88AFEB1
-28AC8277D947D080B9EBE459C27A9DADE26221A016066AFD35F3CBE6616842EB
-764AA3D6A504892ABBFDB04B5EC7D3C8E69068F30CD463BC757AFBDD141A36D3
-6D7C8A8421237F5E84C46AF675002AFCF312E015A27EBAA026FA7A544D921800
-29E624F2ABE0AECC6D391FEAE0DCC445A5C53D8CEF3E46E4EF8F8F3488250939
-7573EDAF90A4DF18ABBEC8F6ABDCB407C71CA45EC8D45A2424561A6F9D36FB76
-A714B5E2F6E508F5C083AAA8A2C57AEDCC25C2A6CE7BA7EBECC4F9C2A0F1A167
-444F363854E70D2298B815068C58BCA91885E74104A683274642E06644521D0E
-86A38C600346B06752666973F4CD5635455BD6FF14D50CB1DCCD2E56FCD72D9C
-67D2ECF30C6D99EE6740095586AD5E67668D5E10B5ACD3A1F34ACAE923D009D2
-A88D0C730E9F51B7608CE98C2071B8EB9B760218116F1200912C0DF585CCEA93
-7D81A4C56E85C49E1046B825E6E51EC5C12CD1DEBEE93BB42BFA61E16923C8B0
-E9551CB7B408BEAB7B01E971293BF6B237DF6F81CD1B17E8E2FAFA616D1ACE96
-8363BFA08C5031B8BF2B867551BE8C78234B6ABA804AA79FBAED815CD13DB9EB
-7D8664EC6F3CF2D7A37A8811D9ECD9008017A8EE5071BBBD6D42C75C2E333816
-A1331E7AE419A1D07C3F4BAB14F678725C804C8038216792799A76206DA6F8A8
-C0D0A0B7D6995AB4BF80641C1F340A1BF768DD25A05DF2E27D18D2C6FCDDCB35
-3F1D40E461C4859F5172B69E1AAEA8D0BF251C0573F0379E1A96FAF6E8D4EA87
-7B0E32D0191E418D036889E73D8F4082594C8EDC306F8753B6B05165C6BE3F89
-48E5A8C892AC942C12CF6F8C2BCBFF1CE76B4B0966C53E3A3B0D9FEB53EFC640
-D25B5C822A214878CEB4141A00F85B5EE818461F5A24D207238CE13E25AE2C9F
-9850AEEB66D566CEC7FB666E7897473CAB6683BB18DF86BE795E1FF383AEDF5B
-51EAD818B276D7DF579A394FD748651F735A15A38A79C8D06FE44D96DA3F4F4A
-64F68FE714749A197A4731EB63E0FF2CB3CB4C20D8AA9050F3077109A452E9EB
-4351D7CE4C8466D99A6B5E6703526C18F4FFEBEA04314EF677B432A407FC3C3D
-09B51301F8DB6945841A7D57E124AA20048FDB60F5B7127CD910EF599E7195F5
-FE5336A8247990B75EB602AC8551147686B1F50867CA015D3978B9CFC3BFA870
-214856B16DE4DF92802CA429A4734AAA7A8E15F91D25EB006A10EDE7446B6C20
-AFAD9B94D447A1614B3636B6A7E621ADFF237E9135E28F1173E4C47654CA1ED2
-4F41481153D90B7371BFB1C4BA3248B8E9F566478C522E1C2760B064559D0503
-C4BB3ADF55F4C8A7A026DD0A69B38E393AC2C8110004057BF9DF430C851718FD
-95B5504D4932479E48E7E85BBD023FC3D28ABC1F7C21BB8ABA0C945A3B9C06B0
-18DBD0CF1B46BDF91F6A2A22889FCBD730B54966DAAC3652475F29A5573CDC99
-A23EA5FF4BFDB666C49BE08571244EC8AA811E5EF31ECD781013A2AB8EE4213C
-F001F5A2E89A41C2FD72D65B625F9BE81E9A3D106138C21F43EC284C0804B778
-6C224A88A9F81F469362528A78C899C531EFCDD69AA98D0317E182A20B24E56D
-BB752A5F90F941B274D98C9CAA11D4B1B44670D943FB3A4B59EDA1F766D0FB2B
-3B58543B3403BE46503E917A73197FEC953C79F6D0E430ABCB066F69FBA05327
-0FEB8A24B15286EF3157EE25826AF5AEBD9210ABD04515CF1566AA299D28776A
-7D9127CDBC812A7A1BD9FBC456DD79E7F189A29616E96407A2967E6607678AFF
-EACACD957127800C14210A12F526494FDDE7F1256189BF1382EF65A786679CFB
-5FA5F058FA48F6F257F934737F41CD6C5D5B514ADC7E3D38D7DFB95A85F95EB9
-E16E2938C709DA68B180A7F6D08F1E6042DBCDBEC93B08EA55A8208B15B3999B
-814D50658FC41593B994E844FA61DA13E2944C3A15D1983D8FF658B4E4B6E016
-4DC17B9B2D7A5C0CE7004E47D28984E3BB231F9B2BE823CA8ABB3BD0B0B339C1
-FE3EC4C064E66A2311BC9693F3D0489C50D8D3FD070C486BF3EFD0C036465D67
-0AFD502DF4C1AB403583C928AC4173A43A7B825C2C67623B12EA02AA67EA7E1A
-60A26CED51F1B2F763A6371F05029340A32BB6477A05334C624F5882B92407F0
-D29D11AD06F3BAFC13D97E54A8BA33619EF88EDD1276660C3F6D10188FFB7C69
-1A75C3064BA8187484FD925439D79DEFE0B301053F9CB8CCBF3D9CFF436C37B3
-B40C4C9DE82D2B856EB27BBC2DA4075F9AA787E3AAB686093BBF1F6D6439CD63
-51047A85CACB17666FAC752200BAA227236AF985E13DC26F9CCC64406DE5D90A
-0EC78EFB6F9D6E3F13BB1F1F73DB96EF2F43B98AE9B8AAFECF0386C2C12BF63A
-091BDA8DC38B9E9BAB4CFD0414C1E26279776ABE590F7F2360A7322CB68667C4
-C42DDC9F719976FD548D2F87DEA7AD54F0A56D5902AC1E56E86951DEDC46FE8A
-9875FB3AA771E57926A5FF95672766EFA6F78D5F6FA9E78578EA2EF20252A869
-A5D05695FC1F275B90BB4D110BBAD769E72D8B6D636E17D9385659B9224A0888
-F4BD685A9864F05F1EAB073215AA33A0B045FF4BABA91AF4CB1A21CB0D12C410
-11E99E553FA98F494A4E80FF15912E762AA915F9D0CCDA9D6D0AAC8815FDD47A
-9A7B5889ADA2C89FE6F77C8B07CF300D39DCE33DB22C072CBADCFB1E70FAEC4A
-0BCCC84A00033A28AA9ABC971AFDB87660AEE00DC098B3CDFE5B5AA49F923426
-DCA91BEA8D1C85E1DC21B21E89E4A8B625984095150CDCEB505AFB2077F3B799
-75EAD0E03F21DD780AE10B38AA356AE01C55CABC65EEC6EB4A48EB5AD41941E7
-FFE2E16A653DC385E8FDDA1B9EC3D923F68C15C23762E5080D4B96BDF3B99FE5
-3DDE41092EFBFE768BEA738A0340BD56FB5C86C115432E7EC81538FA1F7518FE
-BA8B1DE9F90256F708E878B47AE7DE9F0339DAC4F30270C0ED8D059CD6E1A55F
-28866AEB5DB0AB4365A84355FC7A0AC358010C359883C9873391EE640A47BE5F
-D984D7B9102FE3B76F5D283D9EB5AF30A3F9941F4529C475E5D473CCA759DF74
-000D4AAA50E2C4B396D944701CB9EF8534AA6784E6594FC3D6B57700B115E4B1
-283FAE9E4BF83897DDCFD26F72EFA374935E68F7527488B25CA376EC614BEA4A
-B849C2355AEDCFEAAF1B36A4B19F80378367D1C0C83854D45F2EE5368A9E6D98
-EE5DD441AFDE03D1D1275C361B1A766262D2B1A1AB776AD75E9AD7F3A170A87E
-7A66931EC108559B53DD956C071723890FC7E35E829E2F8184A18CC89B89B019
-09EE55639B95B350455BD69E29B64E8C9FDC96111549EBF88CFB6F9D6E3F13BB
-1F1F73DB96EF2F42F04792B4576BD85457D8F23A620060C06EAEB4A400109BA1
-95AE8F8FA23C07E45A72482896E0DCE82EE449EF82118F07B7C4CC5C063EE4F5
-5CD03A9295F44F79BFB78626CBD0CC4EF9443709A499321715A18BF8445DB96C
-DB5E597C4C53AFE6E66913D3A897198CEDC1E9DAD766A096CDED882DB34E1265
-4BF5CE400B5E3DBF836072ED471DF04F8B764CF5DF96395076772A359FB2DF0A
-D89A592F52198A6569C06585EF6D1A99402FBAB1AFC824E2B4185519D69D84A4
-8D7F94BEFF657959EF9750028DECD616F6D9A0E87C09440EC4067167E2F94439
-CD793871669471556217EAE80B0B15014882FEEC8C9515D8E5EA7326EA3A84A0
-AFAA3A3689003AF20FAA38D2FB319A42C704CDFA38D00DD181A881EC11A66834
-F578B65D50C22030ED28F8B08DBA25871C468685029B2462ED59C31B4CA1D152
-B689BBB4F12FD99B9DDA73263D25AF07F4EBA45699E4BB7662AAB7D35853A9A2
-2E7D0490827DEAB840559364C871FC632957E34C337ADEA7201CDD73F522BB21
-829737BFD4E9ADA1387512E98B21EE4E016B527EE20FFCEADD41FF95EF7C0937
-2F2C81E804FAF02E65184BBFB93CC260FC98F89D301A67FCCC3ADFF44DEF32FD
-BE0C5D4FEBA843BAEF012940FCF6BAF7CFADB29320B06FB1BEBDB8D583A65FD8
-48EDE89EB679AAF16A6915909F2B67CA60F43724210924A7EE8CF146CA8985E1
-FE9D341D00CE4A3C20E7108D5BC85D7A354BFFC18E6A4309069B4D29B8780324
-620366F20EFAF3F49CC767C4ADD9AED4DD342F6BD1F58F44A32B4B69BE873FB9
-9E6B03BB06E190C786A258D699E6BFFFC94BEFA09929F74C066777C0EEE3F46D
-5964CE8CE031D2246BFF5CEB95637073FC36964D5D235898F90A8F9EC168D8F3
-F0D19A5478BF8C7532201FBD807679F344E0B89DA7A1A94773BC1AA1F90888F9
-574E6263837E6C89C6B147D977BB0EE409B509D7884DA5EDEB4B417A21BAD240
-62D37A3B63B5106C16F763F5A74118585FD6336EB49D655B6C5724EA082C8B2D
-DAE96AFDE134B1223D2A02F6922A1E6C0375F2C85A6C1F0C709611910A9CCF30
-7F6D71E889F3A3AEDBA377C49BD73551EE33D2181C5FCA0E5C1334331B00DF5B
-0D0FB1E381BF7904A96D4DFD0595CB6D68524816961B459205A04DBB3106D8BA
-DD31C832B487C1776543BC136CEDBC7768DA2E1E7D41D88DF6B71C6DCD3B7A3E
-6DF18600E51B9CB6F5E40E6AB442D39B8DDF3117169AE6FABD5BEC5A6D4479CA
-09754EC4FF5B5A012DE8E4D0FB41685ED114909B51B46F37163C30A3E6AAA64C
-A50484708849FC2EA4BD68A4878D02E16C29E1B4D1EDD55535898FD82F8CDF99
-8D154DD37FD6DC5EB0C03DF892BD3CF68BDF8A180D498869E6DA7BF32FD8BF40
-FD9DF0F6197AECE4483E74C30C6B87C58C0F879CA6E6D86A6065AAC962D26847
-BA338048B5C0F4FF9B7A027A2F0C9B1B0E0E0A2758D703B135945389E00FDE71
-5A12BF0256ACC5EB54A166B0844F3E2B85300042F83D0FB78671CEAE34CA174E
-99FDD2019DFBAB30D236C7E1AC683FD9D4AC55BFB5357C9B8AFA0B208A66C823
-D92F2190F679B4AA238E6997790715FF3A7D193D29AA6E064CE74632B9FCAB8F
-08F414904BB943CBEF6C5A0E0F782934492BA0298D1F27766AE939908650C5D1
-43A29B56F5AD7ECACCDEC2C22F0116C1AE65B566EE84451C87587310AF1C459D
-BC8383A2DDBEE9E91C51725CCB20B2DBA38FB775EA6381B18319141D0F640C23
-FE11241E5E5A735C0F03483314B5B66B1CFA2112A88D2EDB3CAE1DD1B07F793E
-BF81AC8A49B118B30B722A9A239E9C090D34E7152B75D38846B1FCBADB2BBAEF
-975DE30A4C54C358E25AAB98F555FE41A8934276B8DB71151A5223CABBE0A285
-32BB1E7CD5B961FE37D6C1FC7CB28D61FA5DE6B930337F59F1CDC9101ED5E553
-AB897E1D4B399C60C1D31764B442E0FD8FB0F64592C48ACF4502373E3A5348F7
-9AFD8ADD64A0A7A8E208EC630E1834E7884D372DAB56438F1ABD0AFA5C07CD9F
-B7EF6D04ED4AB2CFDEDC6B66D1E0999B1F8587A8E6377DA1F5B665B438D0AFA4
-C6E7E81C1AD7B8FDAAA92A383826014909EEDEAB4FA1585EE041F16B13185158
-9C5427FC5AE2C80C3C6C6EE5F2571934B834C09F0382F957BAB8C4EAEC254BF9
-57FEB935764507DAD1D156FEF121AFDF84668426C4EAB2299AEA936CCBEF4183
-7673BD98B1CC22BC42E4C7CA56235F280A1B098A78B1E954A35EC2280593CCB4
-1A92B9761758DD36BA22A9A8AF83C0BAF60689956A45E64A4B4AC7C6D2E7CBCB
-60046602A6FC6B851D58C07D20CB3ED1B6827637A805D8409FB7FB6329E44BA4
-BB7D31EFCD46CE22625C3F77FA97E827D07A1F1DEB1CA290E518A20604ADFDE3
-3354F37F2F1460A7619ADB0457A1F423302AAA7F1CCE1A08A96ADFD7A0D66FD6
-003BFA038693E420353870922B9DBA3658D26ED8804E63DBFD9635B4FA44FF9A
-2DB58AEB208F005BC288840D93CE8B43CDC028313A7DA1487FBC4AB1C1842F0A
-5266D5122D00C0C12130E00F6F434879B74127DBEB77437A408C35BFA7760367
-488AFB9DE892B1AEF2C3DBACD21613127F49B87DC3A2540B73E0EF4601DC0EDD
-AF6ADA62C68879679485698934499738157FF184D20486B00BFD6ECBC7D80993
-5CA7CB827B4CFF9DE61704AE3E2FDFB5303979CE2E690FBE869A352FD3012372
-F5F50B62E4E1C751EC21A85C9EDD308EC0A3654EAC3D7F11E8AC439771701C8F
-FAFD897BC9C6E093D11AC1B1BCB48BC643EAAA929A1D4FDEFDF0B037D4DB2FB8
-200E2D718595958A47E665A5AE0826ED4BA2E9F16E3C80DC2BD0517C37C5E66E
-1A4AB402419224B691FB11A7769676912DC04F6EA1C569B6D3A3EAAEDD0BD057
-586AD16D5DB6039036132D39A440B46165FBFAB1531E6483CEFDE9D7A8A0D9EA
-B462BD85C29B1BBE07864314B9EF98E3FD411C35CFAB4328FF9AFA383238F60A
-BC7E57C953753548797FD1F408B1C5AD935A40D2BDE614D343A17EF3B666EB21
-52A3926B97DED6574A1A9C83F60A56BFAD8971B8758DCE3149285DDE1AAE1F4B
-CB401296D15E5C6126E3443D41F16E97FF2A12FDAEB88773010B1F1AA68FBF03
-F004B65B0209209CDB01F49335D95DE480459AEA993B1A8E7152B690D8D57EE7
-11B0E98D8364936989F8DFD7C6BD029122E7DA3B1F8128ACF24B559DC47BFAEE
-A5EA01803C0FF1033BE01128E284D81AB576C8D2E6E71EEAB6E93910414F0EA7
-5B223F0421D2F75EC6106C4A13E817D8FF5FA42DCBEA02FF29B64C360D5B8D07
-38D897A538D88D9B5E441590EB25F26840F533B9FFECAE81E0EEB35BCA1FF7E2
-5EEA35E306BA11635BBB6361D5378232BFD77DB099D52B2229CDA4E05B38314F
-6AADB8564795031C2883F21A8F27FBA3E1DBDBB2D37FAEA29EA59C0F040CF9D0
-8057C9CEDD3F0083858C1BC2539B6CA23A8418AC968906C5A509E50078B49AB9
-0AF028658E621F55B331890A74C6A822AF7359BA3562E5BC15DB5E4120CB0A92
-E3F3370A0216FE0DE36E788D33CB2BFDCAC8C30DDEC0ED585E585C6126E3443D
-41F16E97FF2A12FDAEB881454B8A4735F2C79F25B7930A9C69CE41441A14422E
-D8EC630FD949B7EEC2606AB346F667E05D7DBF0043A84CD19EFED7D65BCCBF86
-6AE01EC417ECD42B8D1D6FE49724DC7BF38B98BC11B3A59C930053655C34F921
-332A5B15B7EE275BFE52845A80DD99643F1786082F7E85AE5161C3C3EBB3655E
-E3F29EE24CD27CC0A4FB07CB3803C83FC4B2B3A78354D0E954278AFC74C77C98
-ED17D4D511BB3C28CE5379CF6E561B155C720BF9287911E93FFF1AAA67D0C3BE
-D44A2D79E369B1D96AA5C41F946B9A294F6B673D04BD30A1FB997A7A26A7644F
-0445359AE31AE03EA362A97855EABA676B6984520897A55A25BE65ED13BCEB2B
-B0C86C036F2E0E5008B22AC502A96C815D6E15E1AF4CFA20F1D4F46F225BA8C8
-659792B456273B4422C594CD306613794A1D78B294AA85806BDBC521573B6865
-FC8ADBC92B86F62BE70941CC72F3CFCC098CAA2F521A2A640B1244D999ABE068
-A0201D628A9206F4691EDD31135B79628EB6261A861DE26CBB0AE63E6694438B
-3D602190E7D58DAAFA82132FE1FFDDCADFD4C81377C8B8BBF22CF5443F03CF7C
-7A4C656B329C751D9AACC110997A5CC84D1EF86C370EFA237E333A7E22BDD9F9
-A8223F7E3BE4A245B091707F5B73FB24648387F15FC584868DFC551050E958FA
-CCBAF383B70B03E31ECF9296008E7E14A0C8FD4F4FCBB377CD4FCB267FB1E0F6
-8E315C56035A8FFEFF815AC6E2BA30C4DDE0218E6BB90C96ABE2D5ACFCD87501
-895B4C12F6FF094944AB2B8C6025E035338A53DCE6B389149BA88A6BD774E7BC
-3D775CF8635908D0EAD76F745E145C98480B614B497A452DA716B05A622439D0
-C0DC565AFC9F86C40B618FA651F9BE192578F812E5286C24E7DAB522E1F4AA4F
-717F6FC1A28D9ADEFE78899CE46B9008C808E2331F55F22AF8E6DE837F563BDA
-8D554C43DD2CB687C00DF5FFB4E64A8D0B29796AF5C9812F2C6980F6082E7DB9
-AB152394A44733ECDFE98953DDCA6F6BBD4476158E308B6A4F413A567B1B47FF
-0015EA3478504249B082DC068BDD21BBAAD7F22D53ED67A0EF44057BB1512B0E
-59A0D741E384B6BA9B38874661DF5A96B4A62B2EF5319D08D8FF512FED3E63B7
-58FCD495A44E006FB412CB1D74FB02D446A8FC0C8133A84721DFAF10426E3110
-AF168E8A1A2CDECCBC03A0ED7B6510819F6D4430EDB088B45034BDCCD85181FE
-A89AADFBBF1795BE768420D36F7472A72487D7BC29ECC169B466DAE292D82A29
-A1408073FBFA39CABD1D3E005374772B7BA2DC611215A54DF064498636F2E30D
-B2F1CB3DBF5C9072F60FA592CBDEF437D74FC29AB096B64A94F46FCA7003A222
-51C2BEA0FC2704E7CB9FE42B02F1C5A129EED9910C3C63649FDC8CAF160FAA8A
-00773A6FC77227BB9109CEEFC23CAA6AC4AC771A7A9122B0D9439184620D64E6
-2BBA8F01DFC0EBD21DDD87BB6FC299C48D3BF406A132E0C0C05EE36342942ABF
-B7F8F252EC70527E2614E9390E31647B34FB4F4BF9DFDB49745C71EF9E01759D
-ACC64DCDC7C5B7562B0B5B7D111AD8538E5C96B3C3483531E3DF9F0377CD2B1A
-84A01C795AF1E6D48BD6778C227BA9788E48DDDF0DF942B87D3A7155DEA85128
-98CDA3AD587269922F3BF63F068AFF141145E9E3A5558C4202B4B61395653528
-E85CA52D6FF10DDDFA8675CC72516F8C50ED9620DDB62D651709E14D4201384F
-2666A84518A2142AA88621D2D81176BA98D9A5895B8EEA6205215E4AE4456332
-0D69DEB7D901F49335D95DE480459AEA993B1A8F2272DA8844EB5425426DE443
-2AAAB19E4ABF72035EE6521D41BAF09A62BD8BCC4CDB858302400F780F84C78A
-FD2FF6750E6A33A54BFBC084DE81466C56591BA554EF5D757446811AE3EF7F02
-3236D34C0000F2F3136C8B83FDA302999F0A1255E592C1AB0CB1D9948A2E2A59
-F8B1742AEB3CDEB3B476604DBB8C7BEEBD84C17B295C99C4EE2418D7069A3F8F
-AC34BCE1640DAE78B9D00EA80BA14AB1E0B60DCCBA7F7CB2310E08D89635A472
-A2DF671C74B2791EA65773E679768B6CDE2E1239D5C4E70AB2B88B24D2A7E6A8
-D609BACAC74C18F6C99926FD7C3A3F37E15B750010CF1358C94266F6BB667061
-5D883FBCDEEF6F2D2FBD5E69FBC5ED80B4481836492D0A452AD422880BDAAFB1
-48FCE2FD8C7416636B23190C01E28D768768D62E3196DC56CF511C1740FF5DCB
-FFE8F2DB95A06948135F748A5C51ED13422D16E9493A282C0416C7AC08B6A1A7
-45F83F1ACDE163362AC0E6635F833BDD50AC84EE8AAB6F15B42EEEF07A21D848
-8348B85E9355B1CA091B788D218E73286B897635CCE51A3A5197A1A5A28D242C
-601D7156E2CAFFE9D75627B7F5E17E1975775B62121C9DD9C4208BDE99766E53
-E87681D0F6227CC9B19628F781B150860D0D01F1C5FCCC8270AF90627DC9C775
-F7BF9440D2631E1F1809A5FBD84954BB3505DCD659B2BF1621DFA6E584333C38
-C766AE282BD49866E13BC4ACD9224F0ADF973D8E905BE1D53EDFE9DAE60211B1
-54A5E95314EAFECB96469398711001ADE80BA875935F4B381B470F8EC3BA011E
-B3FBCC801CF04261F97988E5FA87693B20BC52584238681B1FEDA48B197B0275
-DF2DF5977ED674C75A31D82802C0F04FCB4B9DD6CB1D746E055B9517B3BE8D4A
-CE080DB5F5641CDE1F94CA36C0411FB479F8AED77C57E0A3DECE776F2DE35806
-43C2FF74532ED4CB1E9D646229D1F4732CB2357C711BC40FBE2DFD45B7CE6A03
-0BF267ADADEA3B09E1A3FA4C1ED8E6DFF061F3DAFB0F0857C29192867A14D1BA
-0C8C10A5C0648AB8A1F7E68C35848C100815B82B72A98EE2D78AE5FDEE28D417
-FBF2A17C4F3DD614960CB5CC2DD64BDF00B9C5923C7F62D79CFA9222492F7617
-EAEF8A2E677760B57ABFC9D9B5BC3E26BF856F4CB223D90D64677C00BFC3E7B8
-C6FFAF9234946D3C60A0A3A977B37516886C28EF3CA2F75CEB9BCA1C35F319F7
-7A136CADA3BF2485F16EFD4335811D7615849FA8B3641AE4702706DB511000D9
-E1B4D14DCD6AD90B65B133189BD36F932442C0D55E062CDFDE27E0390034503C
-71ACAD5790A4F95E54057A12D3CB0A2EDF34F1172E84955B590C7887F60DA4E3
-BCB74A19FB5C753FDBA67801BCF0DF8AB8B6025C64300079E65214FF6069BEEF
-266573BAD749B169A312C95C6F22DE6FBA80EA8BB281E7AA88E0740F8195CBC9
-AD443F6E69C007FE1C06C98575E4DD443B01FD8DC906C03F12A77F12506C02F1
-A02E5804D38302E0FA81AA5CB2C343CA865E2210D2EE038C3F78BF402688366F
-92ADDDD55F19349DAC523CFD7DBD4CDACD8E52AFE3CDAE38D07CC29CF6DF05E6
-3CA91A99D0A49FD8676CF7767315F1B315231BA851FECDCD0C0A4ABC2B46D019
-AE179E316C22CB30CF4FCDAB9568D28AF18CB636FFEE11D9FB220D6FF27AF9D5
-5A23559A57E9BC3E39112C3366F1A023D9A302B915FF910E63CD9EF6085A99C9
-D7CD8782E05C9EC0288EF48DE7E39BA940B07F9D5B204656BC172C25541107F9
-BE15F3263D2757CF5808E562AE237D04E629DD665E8DB14DAE5A39C14B11C295
-B0FA514300B8EA7D1536894DBD4663A1B50AB9C0FB3CE55AD1A8CCC3E6FB3DB2
-6C76DA3A623F60D70D0BB625E227C1394DAC31F739AAD64524308A83DB3E2C7F
-AB24124A59E12F18EEC79A35C72A1C95BF082BD0954721494C407085E1D0EB52
-E57A53569CE8E37FB3DAE116CFBA0393321EC741425E063D5D3333E92AE5856D
-B02D336DEFAF80280BE69864DDD8F313E448FB954363E91EDDDDD658AE358CEA
-489977374C6F891DEA415DEED53F78B2C96E50DF4E50C83467B3ACB980EADE1E
-D7641A5CFBC55DE441898A1FF2A46FCAEE3E46319FA22E72C0C52730A8BFC3CD
-D927EF0DE76B31E059A7CA7B8FDD12E05379231BEACB696161BC77B245AC94E7
-C72D4E3355096B85EB2987B681097B77624C3941FEF32D760B94F04E7E98600B
-39883A5C8BC421C93B70DAF8B686861E4561A057D452BDDB45FBF3990F78D693
-5706B6F40E423AE58475B7B83A70AA730E29EBCE084FEAC9C44F9ABC884EE745
-F76032B3DD7E1E345385838DD6C6F57D6D9CAAC29D32BADA33D5762A612CB8A6
-654F600384177D6AC008AD0256C66635B0554F26F62D4E912B80B497AD29762E
-D3B68E1300629833F96DA4A210B9F1DAB53B3D24FCC49E480BD4A377910D0CB4
-0BBC38A2A33E8E4DE18CB57B816D4923B7921E10281F4D0A41D347A9A9E94359
-9AB6E7D87891D43882F1E6BDE85AD0EDA3C662DB95B03D4BFB080F96D362EE37
-2219E70F5A49FD44FF87F2389B9E35143EED4D9B6238C596181D514047E4BE25
-F323C2BFE6AE236DFE8F685E652A0518596249C5004013C1C4FB989BA4A7EC2F
-20EAFB8A3EC255B1A3B63D2136661EF3CC66EC1EB8714D9A35763F965DDD347E
-4A5AD0B2498D3F0A4D3871620A68AC317CC09B45B88C7AA8F0F18DA458C81515
-0659CDB421AE4D723FA5EBCBC8635EF65F73700A3262F94C34FBC8B052084E3F
-ED683624FC17FEE33307AEC932F59D55E90C47AD5AF93DBBDC12F32BDBB44F3C
-4C46E1C44A12AC14C9270FAA819DC341467C251FAFD0E455FB0E33C554BC3EB6
-9533374188F2E15C3F2940FEDEB21EDF5CFADB42D371CBD1211C195AE2A2C1DB
-FEAC0256D2EDE6E14BEDB87C87E7677F0F09834F266D75297A5EA9E7664FE0C4
-5ACE4C06C4901851656B6CB6FDFF86A455712337397279F2A45CC5C37E3119B8
-301A63610A91FAACDE090CE8CD317805BF616A66AFD71DBD125526927DA8D3E5
-3FDF89C76833DEC9F84A7A0263D3265A7F01F2EE19E84AD94379D3ECCE690334
-8CF7A4D21DD718CB10253F3AEA499502E5FD0A803F755911A900FED35B6100FA
-86E8A76DC062DAA42385E23E7BFB8DADB2ADE8FAB01E5DC7FA016CF35B353A16
-BFF6312093F1B6BAAD298CB839DFA7ACEBF9ECC3C3F4245A7F1062066CF520A1
-EA42110DF28ECED7E231BE9D5202D6A34B82FE309050DD97A3EDACB53C18F522
-8D9C350F56F4579FD3051FC3D211B2A16ADF483A79F5AD662FA1EDAC95994C16
-27D63C59F47F0A2A0818E65867B7161F83E14DFB03A64A85D62374278287AAAD
-C2E4C11086C1F8EA9341C57558D1780E9629943100DC958C443BC43A2D385191
-8A0CC23A8013455DD6BCBCC78BD24BD0BA72F182910F9A54F39C3B3428C7344F
-8F7C114743B853D7F77E37356AEF3A87A3AF643D025F05D1F96035671D1143B1
-0B4F2D2B2D68BDEA255789EEA9C7FA30B012030508228BBDECA4F73DB091E29F
-973DA79B49BBDFD3366CBFCD58173FF078BB583C58A99395F56B969C8038FAA5
-BF1A184D08BA19717B6F2F761AE6941490D7A3D8A5413350D7F80E18DF0980B9
-4E6A76363ADB4A40DE137306109DA8B55B5820326F8753B6B05165C6BE3F8948
-E5A8CCEACFD49EF48ECDAEF8BD4D458D882F528A980B646847DBC2683798CB6F
-A5EF4ED2D269A13BC8F6DEBC7B77A0BBCD01C3AEEB1487C07FC9540F4E6150D6
-2B8F1FD538A20BA1375E4E2D1A6B9A3063F127E4F23DBFEB60029DA19D2BE3EA
-475F8365D2D6786863BAD98F52363C7D94FBA64A560A0EE40869A1D98B65DD28
-2E5E4E83E17B88AB50F1B6716D73D50077C1B18171DBE993CD1AA09238F08ED3
-2879F02F28E97C76A0C811390F9294FAD538373A242FB78ACB51BCEFC9021D2B
-2299E1863D0F96396824DE103926BD4D8763F5ACF719E5F6F67F39C312730300
-2CF61000D206CFB809F4ED2686995EDCA2CD087E0D879E9D279B62A7D82A16D2
-AB62148D2A6EB3670C83FD026A2574748D297E014A42A55432D5EAA6104B726C
-D2B9B1844E0458A81D478BF53F44409CFD7519C05FD392D7B05CFCBDE18F40C3
-F25AAAB3B0B47746FE43E19436021ADD192EFAA0B14F8C3365B83DA2B08A45C6
-EA594D46E0483414B9C232E07BE7DCEFBEA147451DACFEE99AFB8A47E53438E5
-BCB621172D6A36BECCF3785BB9A0216DCC76AAECD6E8B378BA7BAAA5F583DCEC
-D8BEC310BD56FAB3C659E171B0BB525342F8FAB0D292F871F304B4DFCBAA0651
-C7A072E1BE2DB874998CBEA5DA5691672DB6F5382A471E5194C4E07EE9BFE298
-1B0CA5D6F239AA5DF6AE37E4830BDFE930E9E2A7743A49497AFDF2D8116FCC75
-A63F16F5B035511344BCF63E09DAACD30A86AA97C22C1A689BEF2A7BA65FA843
-6EDE35AD60150B758449C0D93B0DC0CD43322399787701A01986C83EA5FF16F6
-DB42EAF18494A4CDBE2917793A90FDF9C6E47200F0601ACA6FF6CE313CC90392
-EA44550A03D98CFC064B616C166234DAB848CCDCBD76D78C10C2B8696E5308B0
-B80C7190D1FAD81AA210A4E9E2CB5661475E1A02CD82D93D9AFE101F28C26AB3
-840A241FE593B475FCC1191961D0CBF0CE90AE74784F52CAEB87491AFC8668D4
-2113D07432DABD196340D32CF19140FF95FB63AA3986D0FE5DCBA28CD7E94391
-E5E9E8FECCFA6183E7A9A4340D67B1EE8BC15BDD8E82810A67B279EBF42D1767
-C2A7776CBFB97B90B5677553F37C495B95A559A31C24EE5D80ECFC1D340A12D5
-09E1A6257086DF3D8AC3B654C9B7522CCA662CFC62C1693E1E872F8367873609
-A7312EE7E49C963ECD9CCFEF19337B39725C13676E0978694ACAEA999DEA79E9
-4EAB8587031174CA5483548BB5D156DDA82B1A9CCC6587F9A25214DEF1E3DF49
-2E31AA77AD96270F0C267D6E166B55809E4CAAAD00969C92D66E125F9E5DDDE6
-8AE101F5BDA1A741023CFBE9F67C85E0CE7774D57D3B8930D7C3D779D8BECD88
-6D57BBC9598552B299BD66CEDB67D27677753704E4C38F455C59552906D8A1D1
-24F085347992F0A90BD6E7E017A42A6BCFFF5C07D6DF8B7B3732D86FD0CA9AB0
-011869B3670C83FD026A2574748D297E014B7B10CCDB7AEECE8DC7771718DBB0
-1E4B3E6CCCB6B1A41E8730B874BF14E532D888A1FDF43C439BEA165478DF6EA3
-5ABF5AC19769600F7B8C941284296E67936A72132D1CA61DA6B51C2B0A93CD1A
-148B9E6F4CE18673A6B808DAAAC242D262024BD62DB3B00F44ADCB96480DE056
-D81DFBE22BFEBB308580E7F7E902C2C6A18FB7C0BE10B406C01A432DDE0CBF1A
-C54019AD3E8183EF460A18EAF0655635E1B5711C32E17928D1B6DF670054CC04
-3964D00CEE7E0EBF297406D598C01DB574903BAA23F18EEAC5CB36F41E6DD1B7
-E12C321884C5D9C35184B130B2B81B4396442A7ECFC14B5F3F44C0A04F909D82
-D59CAD0D6F69314B2C1BE29ED3E6F129785A8F19C81EF24FFE681D2B4CC3FF07
-2F5A915AB8B0CA2414C2B1A4C8DF83ECF617AF17E598DCA2BB9F3FD72133E2C2
-14CE0D596D39460AD4D257DCDEA1A6706E851DF1C389B1675ED8953E25AD52C8
-EEEB464040B2C785D4A2BD238254DBF49A7B5D41AC27C13150D4ED8DD3F3E9F9
-6D496A48C71E27774623BCBFFF856FCECFD4BB43CA0CCB89524A7E1482AFE68A
-C59109ED6A12325961ED29667AAB1980EB2CA0828D717D15A4514C96122B5317
-C1AC61864D22368C48000AE99A2BDACAE3C922AA636F38AAB3EE61D681403B3C
-FE5AF7F85118BCA69CCE0FEA03DD5DD3F1A177F0D86E0DC7B0D373B6D8FE2218
-E26EBEB6A6D4E7C9DDEFD33B72309C45696670166CD8F39F442BDF5163D9CCAF
-5E69D2389F643CF6D2EC9382C441D10989CBFB8ED964F7110A7AFEC7A30B04A7
-5885A54B561FD72427DBBE528FF8381B327BCEAB4376746DDA53FD1F267F5E2E
-D65FEE8633BB86C3CDEEC6ABDAF38CA975030FAA951762C0B127C8D1B49232D8
-B077EDF0C89D0EB6A21EF3DB40EFD19B8557BC75D148B686A87D07B17B077EAA
-C299C8E78F6025E035338A53DCE6B389149BA889B3620DFBF2089A0E6C4A8F35
-E8D451109E119AE3AB48507AB8BFEC54BEE42E887A285A61065A282A4AA2E870
-658CC6B6D44365CA23036C8A9C60E545B0D9222D8185DE4BBD34935C33D2AB8C
-70640A3B07EF857768FA8460E895C7935B3927327D503B6481CF7F0F7B0B8158
-0F7A84034ED80CED0DF4AF79983D51707C258188D0A4B2BC685A4D900B71104E
-372DD006C09D5BD8A615C1AAA83E8FEA614E03116AA3E53AC69535F016DE1959
-0722452B9E96CF0A9E18BC9FCC1BF0180333B6DC8505120B7C287D34A13C209F
-57B300578FB2D6FA2C7672E337A837C07F22EE69CD649916C35773D079D26FFA
-9827200E224E0FB6DC681B7A4DA6F3AB42129ADFE6CAFBB65DD5BEB334D5E337
-DB4644474B7F22C02B5527421785CC508450D6039B7EB158A5EF039C8EC45DC9
-9D12241F2AFA2AE929E7696D31CD8A1ED77D571FB57B9BF0AE25212A52D33A0D
-D829600699FBF3B6096D0141213E6B67A4DA27CB17746D0DE7EC085A1D1ECD91
-6FC88CF8A8369C49B092A0A4E923DBB843CAF6F899F53C3380BC1F07AC4C818E
-A103F170565DAD8DF42D54E4D439F1C0056BA48005B43F6940B4EAC49650049A
-25249432DC74B09FF1640E1E4BDF8F4B6F8A5E3A74345E38D29FCC3E44C93804
-D115640EF9C73792C9E9DF233C10030731B2FE8FF49E753057359646924CCBB0
-AA354F1ABD3099FE129A576BC7E2B1650C7A47226C1B0D8ACDA775B785638667
-081E297D5436660D5056FFD0D3DEE7207889B1A7E131BD76E748078A8B045728
-6AC280D35634C288550DB20C261C0BD15FA3B7E7DDD25741803DB72B962DC65D
-F1269FB36CEF3DEBF2AA4D0051D39A57B6212893BE7CEA7E4AC7694B7CFCEEC0
-74FE8447CB362A9A9513DCAB9DCE465C13768AE95D4CD1FD5D7177762C5D47A2
-26D0E16201E484DC939CE41D4A4AB1691081BC0D48CE7D358510F14A207D5A31
-B6271A50010E1AA336BD73133F6006D5667320A8F4E8B29E5130373D8517C72F
-B2161C0D0C4459ABD8BD65029A9698D078C5052A1A75C736A723DFE0543AE32F
-AC28AB8D540CF4BBAED697FEE5A08CF07ECD1927BD85A776D20558A8A1E0DDCF
-FC57A6D8473B2957BEFF319D32180098AC3C1BAD394692FF9CDC1E32DD3A7B5D
-320295697422AECD4652A881D50C9DF5BD1E25370499AAD99B2BF5FD6C097D90
-3E87B291F94D0DF9D4DFBAD4F365A705238728DAD394CB6AFA870A1B4B48EAD9
-4822B08D66902C80C45B2949B8D1B947EB79E90166D70429F89E4CC19AE91F43
-081B993FD24B99CD5B7F09CB0424C5EEE503AE51162A0A611190E892D1C3377A
-4D9AC90E5053C20AE8C8D5AE084F120F523EAD11E87D3BF96987EC8E3DD4CCFB
-50DBF6A58583363104120084A5B4DF5BED6475F467ECD47FC82672F4DF953813
-D97A5A57A70667A9DEA17233E545F186E375B2E7C66E8DEE2FD6CF5808C50411
-E3E995021BFF530EDF03F0F37DD81F84508FAC8B0C39574526207A9A15ADF33E
-9562D6853E4634BCF507E7AD0376C57438BCEC02B710F47A1C83530D8209DC87
-A889789783D7BAF435D9D4424DEA71B30DEA52C8BE16216CB98B5BC6C000D783
-A35DA4ABB72A8A0CB3A0EF60A20EB9C3A14046A033A9127228D38514EA1ACE4E
-1CABB39D662DF9AC5871E81DCDF0EB03E3E5D5C45087084FF5BCF2AD8DB66001
-90E9D17A10723D5092244E59DA1A31FDC7D428FDDEC90C0BBDB7D33C17E67AF5
-87343AB6A2F77A9B5610E99EE28760C893004F0FF6F1824C362DE0BD574ADFD0
-9199AB33E984B1932C2F37D72CE8E289BCE928D33FFE478A3D0579EF48C1B6B7
-D9D2C0CDD61043B7396BE6E1B31863BEB7A09843844F99739B2B395C1E1FCB5A
-50C614A3CF4D2F074926073116CC0E21A6AB4CAA2CEDBA125816385BA6A4CF2F
-31031957018202E7A279FA2684744B44E53995A57FFD2AF2902DC0E2D8D23222
-3135D6DC1CED640204057D5EFA1B959041FEDE65D99A38C4418DCC15832736C4
-41BCF3EA39F06B94C76B4627C85DD8D9A19C29C595C180FB895544396AD83BCA
-3C3EE87B3B7DA0659DC9016C341D7281784F095CC3FB07990FCEE3EA3747D114
-B2291AB473A00400C0D2161C45AB7666C0543D1151199B867435D34DE4FB36D1
-11529F4CD2A906E6EB0E6B8BDA20700DB08EB09832F5AB8111BA022F3DE7D033
-481A58BEEDC9D18E6A4C4F010DCE7727E2C39A22DD8C32F8320AA4EF2448D307
-C029D465ACC69F29EA9E146E743FF23E464EEA52BAC94E8987B671EFFBDA7FED
-F68C44148B894F0D317234E5B93A07705F6D5E131582375A39192FC7079E1AF3
-6527967B6029658F4A25AA6A3A2A31184D9E799F1A89AD23AC72100FAF00BC44
-4976F95E0D29F58A1F30CEA9589841761C3C4AEB59EC5B7CE530B7D9209A054F
-AEC5DB7FD50BA11C7C8E75F60B96B3F32224BCD621FE8B60436A92E7810F4EF1
-A383EB5CC7C9D905FF68679CD1419595FD349D0426A06D8399D29D37034D5E32
-AD8B11FBD160CC6F35687A7C9329C32B26C0670E76028B6A0ED2EE5FCA0E5E5D
-5495FED4BB91E5EF23184556FDD8D91AB1786629028DCA382465BB2E8E2F86C3
-AD61AB24AC4352EBB4032EF81E1E424444AB41624E57F1F0D632B10222361470
-C87235908D29FB5C111C70E20DD363C0E4E80AEFED2994F529E8FF5CB04C5F53
-BFFBB695A74B0CE299A184E5B456C0325CDE88001328D680E755908E37FAFE91
-72F99F316BD4E977C5AECE0148D5C1569CB76470E812371F2C85AFC224047588
-61A20861FE013FD244059FDF56DE90F179491EF5DC2BDC2E562B5D110F55204F
-B97C7DE262534D9D78FC171C4E45C410CFCEE4D0F24DE9BD790EDFCCEEF428FA
-C68C969A795F827F3CD34AF57DB2C2EE097802C73848ABB8A2DE9D61A86898BC
-30968AB0F3815C1EFD9A5D5A5EAA5E69FC9990605BE8B25A0783950018B1D1BC
-2B470727B8E5735180291E72CE3F05A96019464892E2148B22F73ABB8ADAE775
-D48C160373031EC17934534919D0CF112E98F0AB2D1660CA2E5FC05F132544A8
-0A3C8121C2D778EC5AB7389B6D2AE3E93BB2AAD079DB6B489C4D126C29073659
-71AB75F9FC3A7279A43F791661CCCE9F84CE854986B22A73DE85208B7E1CCF8D
-430A55097F0247441D29E0473BBA287F9DCDA628378F55BEB25295679DE33656
-DE4A57B781D221C2E0C92CFF820CB5F52D08070481ED64C864407BB4F8412C99
-53514689FFAFEEB7EB9DB0B0B6AE73C7FDEACDC880CFEE01D42113A5362855E7
-6633C0371716F1C2E561BF468F25A14171E98AEE8C4EA2787A64FE298E93FF9F
-EE194145CF213A79D737177B7CF395C28634677237C694DE103FD0538805984D
-6AAE5FFBB8DB67B63131F6FA30DFE295B57F8F1835D1265B5A7E052A766636F5
-42479784B0449805D5F3D31C084ECEF4405FC13C1840B84D6AB848266C0BF823
-79048B1FCD8822EC75011790B2F773E4767C85BDA76030EDA4D7FD489E95ED6D
-4B8BDB902B1BEBB98B09D75EB3C549DF9F96E8E43DE333691B46FD11AA5A0323
-1016B6213E8612D2E9E418AE44415555C1BF26A96D24DC6363A3B14E0B3AB195
-EAB86047652767F4EE0B1D25341EB5DC714A0AEA5431FCF44889EE69F967F3ED
-0BFA9623AB0236098AB59593042533CD81AAD8A9C471EC6F606499F6B3A7AFB1
-235297260AC4EFB99EE5B4C8D47D3A66093CEB824B80E7F0A9205E6E3272B595
-7E5BD6DCBEC86456F4E8E3F12F16E6A5393669400982F75538BA7D723DC31930
-2977F80396CAA5B9B2786EF4F0118B9BC1B4387634BD356B6212A9591C3B528D
-02B24C4F66A8B42A6863873B8FC2C23A3C4CC050B71418C1621225A259AC38AE
-AF34019F352C728C91F2FE8158445F14F544470EE28AFA3499B8A9F747224C9F
-7FE712328C23570BD17A64553B08E8D176F9854A6CB34369AD260BAA8A23BF5D
-CBB68BC527D556455F2EE04826E7AABC974969B84B8B5ED945005796D6E5CE30
-B9FC75CBBE150489AC693C7DF6E18940558F0B55872E2A8FEAEE6F3EFE676529
-45517604ACBE3FDB2D9AEB2B491FF8476CB513596CC4CE074A404A45DACBC206
-4B8E5B3A05B911B89D67DFC33C7A3AF53D83724AC09702571F5CD690DF2B3904
-A6D968DD313F8B6620A91E59C279D9963FC18B01491576807C53E6376B190465
-789380E191267592709AABDC0CC32A09318A9C95D8F77E844A2DEBCF0EA68497
-581770F83952F5020238599613FCC511AD78A8EF3243D6377346E3C13B4E11BB
-7DA45B6B2EC3CD85FFEFA5B1A5AD10FFBC85F554AD7B9F50285ABFD57B6078B5
-53AD3DE612AD0CCF5AFC45F7BD1AF11FE4F13A61BF776933E36F8009058113D7
-83D4BA20262CC542547DFFAFA5F98F5D00E4B188CDC731482BCA919A3A1F896A
-19A2DADD4D86FF1A0F9F7F3BD2784B527526F940386ACA2DABCEB8C62C49061B
-62F2D50B706D71E95F697AE8307A03BBF73E9C20D6C810852B208B14FE526225
-F24695B3525CF75CC7661DA8BB4E577282DAF0CD7567DB7B0CEE6A589E968CB4
-39BE739482947F1C6D1EB30E7BE6BF792852370A1E8F480BD4A37773E7E94D1C
-E78A704905CEBB6BB5F416EE4D1761CC6A69F94C15CBAF6993C7C1320D17015A
-62221E2CBE5373AA639F3E79E65C233D1FCEBB85B138839C183D51C008EC7521
-23B8F51C5FC6AC81C0BC54649D642C43D19C7F2CFD2FF2ECF25F01E4B8AD5E6A
-7BF8AE22D7AFB4A1FB5E6BBF5CFEF55888C05C911E862BC7FC1D418EA1E169E3
-F8FF9ECF4E5CB80644208DC1FA98C478F58DD1B4887D39F4E68DB6BD275E1FD1
-11304A34AABECF0CEF5235E1EAD65EFCAF25A910309DE273147EA8EC4184591B
-C3FA3ACD7D3D2C88DEEC558274FC74A6ACA1EECAE6AEAF1C0EEBCE74333650B0
-0B0165AE4C8A9BE5593DC6B1B6794C65035B1158CB8AF6B4ECBE34ECC1C42036
-F8176820D3BA2C3629B20D494FCA27B6D4C07BFD3B385B425A562F78DE222F62
-5A1691CE8CE57ADE018FBAB4888095E72D3BDAFCED350C75731470AA64535A61
-B226BA5DFED762812F048EBEFCA6F34D79C33B5DE9FE84CF9087B563B38255AC
-32B2D894EED8B618B3695A3D6FB37C7A96309E02D86BFE14AFDCB4C2422AC330
-19E9583A08776779F286B56A27E4435BD7ED0F7E76FA03BAC080CEB7AFC4D525
-AFF12EDC7599454C8ECCAE5CAB7D23983538F5B8BC0F4D0E4ECF9FFD37B6146F
-783A463CB52C3F987588EF1671A0A771A5920B527A69199B7DDE664F040B07B3
-C752CAB169C4DB746D708D0ACC9590B7DCA104DD9EA1DFB6039D2C59FF69B34D
-18E0EDD3F8117581D1D2699F0BB1E027C2A2353B63C7154C219881FD13E554E9
-06513EE93A265EE65DD2585CA59320010A1363F72E2FB94D7604F659C42F46B0
-BB09A3BF5B224E83C822654CF5BC4D062322F2334343EC50F3BBA86B055407C8
-6CDB7C52B728791E55F013B9AEBD4395C36978583836894DFC08A2A1DA2BADBA
-7EC0BCCEF106ED93EFE20AEF2504E5881A5749981A897E7EBE0136DA2990EF19
-AEA0AA9213089D45A24617FB1BD1465059E7002AECB3A497E39819D7241F3CAC
-1E067BB075EC8BDF94C35AFF9972B28E627BDFBD753ECC7B5664999F24219B77
-A4969716151F1B3741D6DEE0C27F05220142226D8CBF2D503C8F0D77EBBF9D30
-9286264EC426283B7585C1CD855ED1F18D7D9BC60F6CA00F108D6D2683633F04
-2E15ACDBA49399844FF84BF593920F876CAB1BB06220CDF7309480B2D66A534A
-A4D10E4716AF17AB6D274EC67FA6ECA9EF8BDD18912FD7D3740C6D85C5725607
-FCE37C111AD8538E5C96B3C3483531E3DF93B21D30F2014E2613B1ED8F550E96
-59338D922D770274B0A5459322547F1F829DCF455715EC94547193B9CD9840CF
-87F65670BD7CB5E2283FA61818360A5DB870C2E63B923D7FE705AA7185CEB4BE
-424923A196FF423742A1050102B840BD2BBC6E36608A56610F67CA49491CC1CA
-4DD07180A8849721EC7395A7B8F1B3C54F9B3DFDABD7F3AE4C9AB94DDB066FEE
-28F66CD402FB770916FBA1F1F958E0AEDB13CA76A19E5289872538A6CCFAD70E
-3673C8BED4931027AECEDCFF854CC3AC19482CA681418BB883B4550C5B6CE6B1
-F3176B8003D25BA625C6A749C366609D095954AD206420C18C7AFDC4CE39D27B
-0B0ADF02B146CA121A70050A18073850174435FA6F9E72C238B7A48CACB4AC69
-B3D1D6E1D3D17A3B106E635904F196627E241F253DE8D54756898AEF86B18CEE
-8238655681B001971F293CF8EB6A54859C49042A008423964CB56DA11B02BFBD
-BB6B95C298DD4689290BC979F03FB1E2A7451675B8F0D622758768A74278259D
-2732EDA8600201A4250517F399854B5ADBCAE31AB4DDF43923E2969A8F4CC0D8
-924C90E2E028F14B685D483A849D29F1CC10D6CA809478563AFE463015807B51
-6444DF3D790E32BA259FC90335C2A77E83D1A804550EEE8C7E7C399B8D09DEB6
-46BE09DAD67B3496168CA488A7C61A08C6659ADBAD689ED3094CC31833BCE783
-C9C376BE3EBC327007F6F08731634F35CF7103EBD648B95EBC2300146F9D80E0
-B685671E2881895138C2DF073F9D118179748A711143B125418C68866DC4DD53
-6A07F238E7B27ADA83DD1AC8F18610FCC7CDFDBFC2A74E488E4F7C82023F6B53
-E7702EDFB5C56D031B0BC96C5A6A9B7EE808EA3C36CCE4069B1FCA4C93737280
-CFF37D45E848DDD7FF85285CFE4B72F5011977C4F4FC48C919B6867B1C0322F3
-C8F60100F20FE3D7C3D6F202369C03C964E130A6A3B33F40E2462B9D23EEDD23
-7344E597FC54638A67156C453F496263FC5B5B8227429E50D1FA9675AC21373A
-0843EF4143E5FABF69310BCF766906A395AFC353ACEED85F6557B423C06C89DA
-157F70DBA8CB5ED2E852BC19201CF22E5C169EBE06307F1ECC4F900F7E81EB26
-96AFCE64C1080F0DCBB5532A4F584E700049B3CC8FE919D55E03AB6A69A4B916
-82DB727263624B35D22FCA7CCE9A67D4504FC1BAFA1652D965E6E8ED6DB964A9
-A2C4867AB5F552E54DE92D9DF52CB8C6EBBBD5813BB11DB6B147F75D950DCDED
-7405C1B49B48B94474AD10F88DAF3697A076A9D67EA899B19687E506BECF1947
-D2ACE1E45048A8FD7AAF81C1D5837392B1EB9E514580E6097FD825B080ADF0CB
-46435431DEDC5096CCD5DEDA9B4EC965F20FD452DAF79E3CE3E32A46986D1902
-9F54CA543AF69D52E5EF1CA0E3F2D03F15752D5A8AC3A9BDAA9FD62A998F77DB
-A3A320DE1C232DE70425A046A4A1C69698A882DA14ACAED323DEAFE079D8E7FB
-4E4218D2AED884DC7088B6E37BFE194D145345D1F6D09757F728E56482127BA6
-54667224C5C327BA7C4059535C34BA975A756A4775529B87C76AB5FB9081462E
-3701D485345FA762B5C47718214ADE09FE538B23688F844B44253958A76A0582
-998EBABC0D7584F171D99039326CE8EB82690E7CD815EF823F57EA5E29CA97C0
-747BA67335F672BA95A862AEBD5E357AE63F9A97A2C92AAD8041372C63A3E020
-6C9841236404728304F8447E9EA64B143CF6AF5C08136AA11496D880A38BF73F
-4D12FCACF35DD8739E42C58FBFBE458C94707C825C53B327D89EF39C556012EE
-5E31D9C11A0A60AEFE0E7079E7C04CEB52B02DCA88DE1B6EB0C1C47C8B7DC5D2
-E8AE95B1FA4C2F60D1F8DD87A889789783D7BAF435D9D4424DE3AB25CAC39266
-D3E4A190F18BAFF8145444A4B33DAF9D83A46EF9BC4210C3652D589681C49267
-97C5878337B23DE5DE7D508B5D2E4B9FFF872FA2EE85982E48BA5ECA86A3BEBF
-3DDC5FB1D62336C6DC98BA3D193ABE5CAF809C6AF9CF31345A8EE0B0EF884808
-520A08D611AB049D38D79C6EF9F538A5B366063CE605C921BE7EFDD5865D649F
-955FF368F3E3153D1BB6B398ABE3BEA00CAB58234DA432D462D39FD27EFD08D9
-C5B958F98C9705C655CFD1D12CB2857F376D4CE59261BAFF1A8A50279607C8C5
-0EFED335B0FD0EB25D58F5309529F24EB9BFDCAAFC4A23CC6FAB0DE4F8B78FCE
-9BF97A624E689F4E593E15CA50F009E610CBF667B8F013E5BD513714707D5E75
-122E9BD66526CBA0ABC48E8AE6B1688FF8C25C464C8DE841813C3438080D2057
-E7B69F4345188CDF8229A2A9475D08CCC2A3B9A71C78D97D57AD16CCAB7AD48B
-74BCEAD013AA352ED6369B602A6820FB41BE653402C988B1197DA58CAF8A510C
-59E13F2A893DA448E31527E6085EC42BA53B144B8A437A0874F11E6E78FB33DB
-0F0235D303D5186D6770D7E095A90349D3CC302E4E863FE63C4EE141EDCCACF1
-BAB40513F7D25384B0D340430A5F9B3F92EDBE20BBC686A00D258068BC1A62F0
-4404166720C341B35EDB4586541593F8536E8D473A35FE8BDA05362C779ADB80
-09BEEDA495FB7E96A9D101C6688152F65850E258E9545B720871B869DE025AEE
-9FFAE558501E9D8BD94A35F727AA9A71C33D368CE03E7045BF99AAA7F7BA00F3
-C55757BAC2F85E6355C0A2EB388B751A404EBE1D6E4A85FA54648D55A6CC58E5
-99F5423B549EA4606DE426020F95E07A58B2B9F86769175F99F90508F5CE503B
-44C533D473316168274219A3D52FDFD91F501260D47FB341FA124B395111FF22
-86AB9F162B86EABC2008C55DC2822D61D9FD8AF7C15086E5FD1820DDA9CB849E
-06FC42AD1B381A7FC8F2074DAF626748053A51101B499AC140EA0AFCAC525A24
-2798E9AF66587D0F331BF14A5FAD8D01980777AF9FE9ED826DADA4972390EE80
-1E5FD7734D167AFACB2415433D3E55B504919FCB2BCDDC054CC91C85B3597B7D
-BCBBE833C0916F666504245ABAA2635F3632B4CAB549BBF294D1BDC3AD51A118
-DB4E6B848DEB130A56DCDB935ABD3260FDCEC2B6116127D4313DCEE81AD1E409
-405895F8C6A43E375E4AC001F20E9FEA7872B3775E1FE556DB100BB5E216B775
-53198A68F75051096681B771253439471A25D61F2E91A96E16FDDB337474D437
-81699AFDAB98393605EB377F7EBD25E7B62C2DA82CF09948A46297D3DF65E84A
-150AF97D63621D7887E6D25DAC343737B9E9E6D048D7E2D64F2604418C884641
-113D7FCC36B76034F37A3CBC3367DAACE9A220DFF0F6C95BFDF4909D9FB5B381
-82110BAAB191FF5B0389A77DA7110EF40898D7F2206E9C8751A1DCF4CE35B2F2
-3DB6068ADEA4771A6B5A94E01D479AC152C7B16B0DE4C97C1C2E379B2BECB9CE
-C1E9CBD2182564CBC6D032FD49D5AB137C172E040482181D88EE923137013492
-BE918865CEB7D7904FBE0D6CE8EB82690E7CD815EF823EA6C2877253324B87A4
-C12A18D08F7EDFE563197C89A0100AF38CF7F85524EB9327D1B29FBBB07B8D31
-4CBB30FA57688C97CD7C7C9EC37930E27512B968ACD62F9C5DE49C03FB720403
-11E96719D178A8CD7EB7504A31AF3D78D061307879F2608CC69105C029BA8D4A
-7B964A305F8A2101572777E59B3CB401C9A2671A7E019746C28E8CBB5DAF0430
-BF2B6039464E356B50BD9E3128227794FDA75C0305C968BD907D9138544B713E
-F29426A30BD387E54F1BD6BD48B2DD3EEF0434EE61ED7C48B0F9D65B1B0697BA
-4437173CC6A46EAF491CE04DFA281908DE892FACA4D1ABA93042CAD9B3058B16
-57B2C480D92CC613AC5B947AAF21CBD08A2E3B1BF6B7EC58FADEB7214E434723
-BB02264F53B52A9221A13865E8864E6F75D40A38ED471D2B68BFB683965CE95D
-09719C82246C7F9AD6801A25C85FC14D3716B645EE3FF46B759E75EB57C655FB
-CBEBA20E12A6B89D792D69041F008F36B9F5777C45F61CA7707EDED071FB0976
-1997C01E99C910D18C1DCBE9942830173961D1EE5F1403E30D3B9265ADF81528
-18A2DBD40C1365F2863F24E3D0E77D9071466ADD35EA17B49FC53E54F0180C3F
-20BED95BABFA45C59BB87134F56F6DDC7CDD5B3D625DFE4BC40DCE69F4361E52
-73DA715BE8EBBBFC6365EEA16AEC84B561C94007AFB3B9D2B58A91DEE9802B6C
-2B7EBCD0F0E28CC1198A84ECECE33D7A162F781736FCA7D87E54E2B1DD43A458
-C557E303C569492C3DCC7C3A1162682A719FF916E6BF859686F6F08A3CC07CEA
-9151BB3C676519D0968C7F70B0E01D9569049031B0CB8D9271589795CB99777F
-D2D8A4F18A6EEFA9BF9407D73C5BA42F50D139A2F87C2614D3548980353A6C53
-F47F0BC75FA49BE3FA0347CF24E7C89BAF56C8C376AE1E9568204D34D67FC196
-A380248F5F7C4DCA4A1AB06A04B309EA45653D1CB7231B90B4FBEF4BD42CE514
-8E2E8B29F7189FE0D4BEAE918F3B43E35DFDF3E388792697DDF193801C220F92
-14878C181A430FF6E45BFA39AF25EEE7CAD916AF093B9CFFF3DDC21C184C9124
-50DCE380331BA4ABC51615EE5D8441A99DF86E7BF7F4F19B865E66B2436238C2
-05B14615B9FADD984F27AD672FAF0AD31F3CC7F2ABFA021B56CC1B2283621D7F
-3D46A5B576F5C3504555BA1C468685029B26DC46EC8C2071B8EB9B760218116F
-1200912C057A90E5402A179F2CE4038057A8E54B86751CBD2C6F8FCB4C69B81B
-83F3DE4BFF9AA2FDB171BB810200EA42792B05EE8604E044677CCEECF15A358A
-6D9B701DAF00476083D7E55E62BDF3F1387A5765C889845BA3E641BFCD71BA0E
-FFC60665EA8C7D1911675EB2AAE536E5981CF029D6044761F6AC4248B4DD0A85
-01455C630EA8B2FEDDC4ECD2E027CAA7E47CD79BA6590ABFE3D82563182ACE5F
-26F28357151F0312297D4488AB58231EDAD7FD489E95ED6400E6C9E03ED38DCE
-D8595FD2F0F24767A37905556DF8D9EA9F089E6255751DA6992A60954063C678
-0A5D0DD42AF1F80B7C41C28075ABD939AB3A0F6DC112020338A99EB84A014856
-86CC04EF6188FEC4340FC7724F9739E9BF73C80C90A98A4BFE80B440ED5BB438
-642E42FF7E89F7B7EC58FADEB7214E434723BB02264F53B0214DFE59BBC83093
-AA0097057E98511746178E03DD8016396A43CA64927852E3D9861C668F21F154
-4E638C756553C296724A240A89A859DE1890CB49909A2811CA7986436F225200
-A24D95F2ED54290D18669353307B572DC6669803A1FC4949AC98BF3A8F45BFB5
-024F2D915BDDF06338224565A9CD8CB62CF82CF9A610BC392B6F93AB77C10207
-D2C8B19311384F24598722F9B696D09272F8D6706CCC05401F995AB75AA569B6
-CAFAE547713D0F7BA5103FAFB49EF22CA8F00F055CD83E7D52E442EA02E581CA
-D63F033B04D0A17BB868F8B54699D1CCB02E6143A0EFE51D2ABB47787AB8FF47
-08C6F40E3075D884212459C6D27DC1FFFC271547C1152EAF04B84479FE9FEF9B
-EE08C93E676D71335A8E3751C29155B007398319845C28648410EDFB3F813E16
-648DA877C1E3EADC98DD86AC283210AFC93EA37CC2F783594DE6123338345A8E
-E0B0EF884808520A08D611AB054EC0179769635EA058F2856281564D7EC944B1
-E2009223C277E6A0FC6158005511B081AF211EE4ECAB2CF1E1A7F12E6405D970
-EBE676CA582D1D69099DEA0FED70B3DC135B4F6BB07F45CBA6FBDB4418225E53
-8C9D8D83343E89075F5EAAEAB6F3F9CF07DFCD9B962A65F8E5AB88436BF64E3D
-45BD2863327CCEB361EC854814F692C90E50531DD64039C230A6A9FE0071C240
-477F32573BD733E0DEE8A4F5B8BF91F528E8A014CFB8690DD38F18F77A31D381
-3FFB58E225C51FE22F794782F47EF717845F2D4F899C7F1323D614E16C7733BF
-56AE6BA3F64F76691CA5A4833BC348A1E61CA45D557DA14428D1221FA8330AC2
-63BFC99EF7C10ADBFBFC2E8211676F375782CBDCB2E42C04E3ED3F1DA3AF6456
-E1F3CA3831A76F106E667F9E91865F8975FD450125C9EB1502D64929BFB8E89D
-5313570AFC25B6FE29D40BCE62841432BB56EB8DFEC5E56EA980AF8A14F46FED
-6BE897BAF99BD16EC9F360B9B976ED055189493B71486D921DF62EA1EC80DA59
-9184F48143580DF45B39230434930F24F928EAC244CAD6F9BF5528DCEEEFF00D
-865999A09D5AD428839828542FA8FE12343741AD49384B9C069FBDB0831C6116
-9B250F1A80B8A883C5D2B3B78959EE59DE1CFFBC4EFFAFF00D29054A5911CEBE
-02EC916BB486871FDACACD9F4BB11F629865683E164AE60471A6340C4308A3FE
-3B2B5EC30A47C3FCD41E7BA921C341FE2DB804C2195EFD9817CD55AA40B796BF
-F1833FCC9BA70E3A369E78E8AF00B974938842FD01B7ECAFC159A997FE183D49
-4EBD62F23805FED20C07398C16EAA2B2C822BA7A8048BADB860F1538363AC9D6
-7696EE9341D32AA35D91124EE5DCEAC78C8F28787EB15CF3E4F68CB4DB29E22F
-72F6C86F41D02E5346CDEF765B7B097C8EDD95A5F9611B35D898DCF84D403B9C
-082FEDFD718FAE8C7E66BB3E8D6817070CE96D322EE6880AA0CC336D1B5FD0E3
-3CCA75F5FB1507ECD236EB945506F442C105B236BD37E1C7C43CB9DA26F9D0FB
-21C434FE2DE3BDFA26D24C4FCC92C1A8998026BDB99E910E615A5189A41081DE
-B45DD711488E406853A5A013581A46DF8B9288C97C1AE272FE83AB5351D5C38F
-ED668260EA8879EF78B4C92970F5F516904AC4A1A00EAF33C65CA58BA761AC62
-2EA8AA58FE0B5DEC627172D10DD0A55213B5F2404925368DCD3A257C29E84AD1
-386C6B61A5E15EF994AEAF8BF6853531B9436E94DDADAC273939DD770974B196
-CF4680521C166453070EFA5A968937157CAD1E44C4FC5F060A58A4B289F71E0A
-7B6C57A9DE0839022947957AA9A1C98A74287704A56D2134BFCE5702C75743A1
-9EB312118BFF5A24E4FF1888ECEE4BECC76AE143C0B8F46598B144BC6FC56F4C
-60915F5886B34D8B0E8770F45F08A49A1B5F33685187943C7B3EAE5F31C66313
-15532CC81E6B68697A78C0EA28694A184C9FC05A5C20CC812CACF7FF11B4B138
-F5B71737DEB70C29FAAE5CA8513697176088F976548B25494413A8E9A76EB90F
-760875A07674C9E9886B199B3099B051B7D6BAF653662EFE131B5FAD9FFDCB5C
-D1FBB4CDEB5D7E8002400221C12A9D9E4EBDAB441DD7633F7E773036AFC95EF5
-D66120A2E0DD954ABFE0C0A68306BF04D894FF7239C0727D31A47273D009FE3B
-5BB0705A054BD4656A6FA42F3010A127B90553E52B30909144726492A9381FA2
-D444C8BA71E64046CA64B07041A32A2CD4E2DC961805C11F33D554529BBED98E
-9B33E1A28F8FDC11342F692C47424F6E1F4059C474F38CCEE148B9BB0197602E
-779D8721C358C413D885ACFDEFB9466A40768F3FBEE331237AA5651C685C892B
-5CC6570CA4757961B6636831ECA0F8B87BE3549FE64C282F92BD7ADA0071AEA3
-37BE6580744556CEF3EDA3FBC4EB639ED805C1160DEE19259864EDA6D5958092
-060E1BBE06F336F9B31BC43A659B9224A277E39DAE4B1F4329D0578D921F431E
-52D386C5C3C820C77B0614508AEC91C5BF1D9BC4BC86A0447DF2D2F8AED9616D
-307713089224F1B957C12FC00B99594E3B7055A2E28E9E929720A9A8E40BC0AC
-69332572834FC089732AB9257978765B08FD1933564A845F18148B481E89B057
-408A7366EEE0638C1B2A9C39C6C54F8DDB7817CE07AEC10D671EB0E1214231AA
-D4743B196C108C4C08A13AB566167064AB08542DB96F22756F879171F49500C2
-CC2F349E947589A7119237DEFA4CB7D83522B1B066597E4C9CF54DE449335FEF
-F104BA204536CA3D1F9C73EA6B21DE24A4633E8C4FD5A5026FB1A7687E22E6C1
-D5D4AF8B97E1BDA1B94A5B9CBCAF2550A9A909E205BEAB20B9C50F06EB219E9F
-34BAD5A87B9D289C5F0228E28996554F6DBC2AB4E2B6673C79F5569843D01C9E
-ECF3F8709EFC582D4B381136CF3EFF857D7E72529BF5E2B164936143663A1B48
-946531719C594B300DA573A543FA3813C8C501A9D40DE20885985399BC432FF8
-FDDA9AAF6701121CC345DA2CBC59C08B8DBC55042C8D7BD026B159A61E712E1C
-BBA825B8DA3C2B95B40BA3B134DF7B43AE695E86255FA5EB839E2D73F12DCBEC
-A349561889268551933B05EBEDA717EAE6F06D02F4B36052A66FC4ABAADEC307
-FF1D04E857F077C359419B32B4AD76E8E15929C11019F60055CAA3336A72D2E5
-046169FADF335767CC27E611C815D6B6DF63FE65E92A428C4351AFC8A18ACEE6
-9A16021B0A6188A69E24579291B94B09493CA7656DA2CD7661D66AEE53CB1F39
-B56EFDDF93A1E45B47724E41DB4205D1200CFCD7F510798D2EA69D685F8592F5
-59CBE379E1CBCDDEDA1B69FBBAFE27CEB5E868B2CE2113416A56856B2EC2B06C
-5698FE079E7A564EEFD0487561C9049EF7D5DE455D3E2445D997DF463AEC9962
-91983B29F0773CA253CB694395FE40C7A582F443817A2DBA36F655B7864D8BE4
-02E67959A853734C237CC5C2AAEB4A8E0028DC3CC80D3BF33EA8DDAEB7ED807B
-849BF7008A9B513D1958946B3105AF4F88FEE69EC2D3FF638042BC75D0876359
-AA48A4627A7B49F80E4E727703DEB6BAA91BDA86AE5CC081E2657740EF74D19A
-425917974EF7A02C99A3FFF334625A47FC66EE11954463D6600A17ED4C028542
-25B42ADB4ACF269D70EBCCA996BD48AF33D63080218EF947F06F8CC552C9A6BD
-C6F04A612DE0A010C16E27EDA16EAA18A7760E11E9873BB0EF9262F18A75D9EA
-C932ED1B2FC469A51FDCB3692D818549BAA79C71FC44B61BCE2A53D14C9CD1B3
-69AA1D89B9BEFFB4D8C8D4CC21955C0BC8534A8D042A2892904AA055F13EFD67
-5747E1403BC46BF01EA715E0BE3C0B37FC5F13D9598FFEE4714DC6A4E85650AF
-2902D1D4E796D3F9592975D46A86D4ACE66BD5B1E4895B24E34B9E7D5C4D3300
-6F55CEEF9DD439477DBE791957058A1BFF3D38510A8B1E8D692F82221C0D0228
-4F4E1A03F2CBE758744C4DC36BC0B3C1533E1AB95D2D5BAFA00555363CE9A004
-63422485CDB2BEB86B7BAA4DB298E92EDBA3B4CBE5DBCB63063E9CEF4190C3D6
-0DB8F69EC10ECF8C4350D1B42C3F463C91787BDB31D261AA410CA1F6033533B2
-7A95E93DACC191CDCA7B1B7E1BD2E7B169804610DDF6CBE34DC4B3669F9D55B8
-214ED5DE41244A94AEDF8B39312798C5CC828F8DA0799EF23F0E13B5C402119D
-EC0E921DE7E75BFD5014A39D2820506253A21FC3F3DC447CE0ADFAF8AB10FED3
-202C5D70278D34189977217FEAE275E008BE2A9E46CD4E13586642088F523124
-089540F8F01858D08C9A11FD8478484519A21EEA38ECAACC578E6AFF2A78F0F2
-655E0D319A46AAA1AA99E374E08414CFBC44D28486B6BD2C8806D062834B5DD1
-7EF5AC689609C39ECD8878AC5033ED10E0124AA411C1D25C37E7DE50B54ACF35
-735C298A3C0B345FA3AB6C46E841B009890EB081211B28BD1BBA03E9F31528CC
-992709DA92489200C8665A75BC8E80AD171B40042CCCA9C93A5C1D1196B2B5D5
-8422043C9E6FA5E03CBC0644D19F5DAA9DAE04D05B31B5252F16C538C76DA224
-B72B3FD6D176F819E31E7D3DF647E2D4999FE6A0DE6DF6DC47D17EC51B652DD5
-16B02507AE571FF88E0ED3D63F36691F13AC80D0F63AC8F58F8A66F6DB1D353D
-F72592DD06C9E3B6642B88E3B9453AD8432E02EF88C5BFA8EBD9980E0D46B855
-BC68799E247A08C67F0553E9188FCEAE7175F58C41EAD02F1E04DBB79D433DC7
-C6EDEB9DAAD6B4B9EB4F58721FBA5678E67D28758503B8AF2F7D473969ACA8B3
-6D260178BBFB4E9085C76827CE47DB355BEA13D2F2EFE1FA920B455CBF179FFC
-6332060F58DE7C7D9FCA742EB0F64D0BC20FF0C7A765ECA7433820D0AA0C416D
-CE23B325E84440EE2576F50A9965537A2D8378AF8DA2DB25326B93F68807D6FE
-251A45DBED45FE728E41AC313E09B1E98DDDE4534127DECDA30528589B23CABE
-4D575F34346D0142B84AD90EE9C0C952BF67D04D706334D3BEE929AFE318F4E9
-42B5B7B9F5783ED140DD88C3CBA66FB93D605A16D0252822F78FCB375FE11CCB
-A0BE6657101D19D38370AE8EE4C6CB3794B363E47536FFCBD994CECBC290E973
-1790E0C229E76B96F368D072A5411DBC3229305342B3654D962C496008320B46
-22FD094D0990BAF08FF7B8CD3B214C27E246BE731809425575B7B78FC6905EF7
-7F476C56DC2D466B3E37A8964E85F3E332599A6862C056CD8D6A6E5BE4A68D2F
-BE01781FCB57630DA28784DD2C1ECA1B0F29D33EA21E1EC7D98753CC0B0DE8CE
-2EBC01607F748CBF09BE6B304B6A7C8B20A4CCE1F21B70E9A72196619B2885F5
-3B5613FBB6AA7828EE0DE066DAA0F7B37584E69D3846E4CAB40F4C3363E7CC30
-F5C8497AF7F3CC55FF1E5E038185C219143116B1216E617CA3B4B2CD42E74283
-B405EC73C48682A684ED9C4C3C88D6C66595F801C53733B844B1FF523FEAE6DD
-EFF36D20E721C0E2990EDB17BC7E7E6B47B44B6CFBAE1FC1EC2E37AF4EA714DF
-2EE9258DB011C37A10167D70AE8E74941ED68BD2DC37A3A0CFE28993C9DB0149
-8C28EA049592F7FEF72BF3252CCCB4FE5D9E0395CC4A27E0AF50087CAE709C80
-E16198740B6C64682D60644CF6982E936026833D02357AFAF505BBB4399AF5B3
-9B571C9CBAB1CB76146F11DB9C67E171D02695507FB58C02AF64A3F9A3E44046
-215E511A29D9ED23A8DCE42E09F8AEC681D2BE52F45D126B05BF0774D61F8AAE
-4F41599D4EA851F298FBBAF954DD2452740CE664E3AB4F0A3A1D23E3D7A1FF95
-A19E9F7C25618DF3FF44EA5130DD54CAD6771F05B8D8930F24CB7D51EC0FEA67
-A6F22E6C0ADC4A53ED2E67BEF5621FF6EC41A11BCFEDE3DFF1E55520432F60CB
-F8DD4952BBB002F5BBE7B326CFFF9DC25A9FDBFF6DD130E12D453750B02CFB9D
-A8F7DF6AC43C7BCFB5CBE8BEE5F43AFCBFE1DCFC843BEF122EC34136FF9604A2
-B187C515FE807F7501C0F79DD13A91E165B94E21F21F3EC5025979795A28D8EE
-E8CF1F375E4072DB154BDF85D4A4DB6558C02F080607C5833A1234E63221E5EC
-5198D3AA4E28734996C848D09B52B70D7014877C4B912431BCD6F322E71DBF12
-7ADCD2145D1E57AB7485F8424431724E17611AA60DBC04464FF1C1F0DF8A1798
-DBA973568222F20C665B28C93548C53FC4A80FA632845A15AB5EDDD225374A5E
-E30CA81873184F97C0F359FB1633D9478DD42337023E6C31D3CF0BC861D5120D
-ECA23E694C8920F87882A33EC2C796A816C32C8129151AE11F492142246E7760
-713FCE2AB36097A94D72BBEFC2437377995B71D79AF8ABA3C7DE20C23F80A9E7
-B596E2E89B18FFEF3E37771839E50C253D90E3AEF7BB4ABED3E92680242F1E85
-DBFFC65A6651FE8AF5306DB5BE81CE0678EC10D256B22869F66CE2AB8C64A7BA
-D995D50787848CA545832F287EF1E894A6357A35CA5DF2E6CD14AD95400FE6E7
-CE4779C51FED4DB577E1133E2ACD0DE778F9F450777832650C685334E19449E8
-3388A7EDC1A2E8C45F11C10DF016A08A86EFD0417C0C368313C13C7CB6D860AC
-6E3C4D2909609692CDC68CC32CD8F13DD25BF2E9FFF3798F8626849A475A4F8E
-7D640B9AE1348ECE5AFA0CD99BA67E24211B729BE417329B705E0AD40D58A1B3
-60CA6264BE9A6BC3161A16DBC05025BE2365DADBE6C25A22E9503771B4E01844
-1737B8DB12AB27E665D176B23321BE58F4F60344746A140943A21BB8375FAD62
-D4880707D784D8B988AF4ADD547B5EA2130DAB02853A77B923BCCB1F2AF7F3E8
-CE9ED8CA8EE0764B91FE8E5EB90B0C17B107AF6A64FC51737FAC17A32FD0B699
-2AD0E4E5B9DD6F801ADBC455288F30774EA0F02618741F944B7E91828123EADD
-4AC58810C5CB85EA6C4C52D2D613CD1E3138F8BDB1AF4950CE4F5336F7AD8703
-C0178F058CE9D7D762C3266F419E61B87FF82CD98E00D7650101A99921ADB106
-80BB85CBDE4E8BF9207852CCBE3E415E591B9AA7F51C630A6E818EFA57DF1EF3
-CC6133EE41523FEDB4761D52B2C2366C2188DCFDD17610FE2ECEB2BCE883590E
-1DFBCA43E5C88EFB24788F19B1C893F3343331B8A03AB1076BC7C96F1DAFA16D
-E4E2C5B0E12DB3115AD17D43453312DC576AF60E797F13DA12AB2BDDBF839F82
-FB4F4CCCEA3ED3A3C4C4CA336644E9CC92BD9173A222FE465954469BB637146C
-6B98D3FB9952053804387743D390B807C5C16D6B26DEC3AA76EB39F6F520E0D8
-4D3CC188A9551F14B8C668988CC65134F561FA9ED6CCD6594F8E2B6DC8546C7F
-6779095AA991D32FD25E5E7A133DBA1FCBD74BC7B0EAC0F718185FDE400C2C44
-8B59991C9C1DD018F3902727EC317F7B28D28ADAEEF244BC3B09E010C290C8D9
-0E83373E1EA2357EA3162D613396A11D1C38BE31430A9F883C87EBE445088684
-CD799FE721AC49AAEAC072130E8D2F2173C4E634CA6E69F5DC6E4E89E53E7C3C
-FA380AFAF5115FB1000AA9A99791865EA1E194BBF52EB343933AE0A363697910
-1883D3BB3F2B5BCA74BF77AA0AE780748CC9DEB8F919594616FAF14CC038FB48
-6CDC991D5714E8CFAF29ED79F3D14B529CE8E3A72E8770C02C84221628AA110D
-7D7F6FF3841D4A13E188538760F8C276B50C43FC3A5A440297582ADC8675B878
-90EF08FCA0A37F34C988401381B30225C18C5946D56866014A3FEB1BC623EF38
-3E7B0F8471CEB9022545F3D90F2F21057CE945980EE45965F7C6AACFB71A8FD0
-EE68B1078AC40E104ABF5FB58A5AE3DF8DFB99ACE094367928AAF1B85FBDE001
-FD299A2D3243D0D4E1F9BF5639BBD7A96D502C48A5932056DE708A7CB88A8CC5
-E352322A9E0E8ED6E05E963828E3D76B2ECEC872496754139B3697776C022DED
-9FBB8B7BCA4C1BFC078B1B4BB7E3530FD2DC2FA1BE263801506F142B686C6879
-BB487A74B38968D07A02DFDD52AFD396E88CBB10933037B3211C57F25EE294E6
-EB777130AC311A0EE1FAF898ED8F7216070DA8C51892E04AC47E93A6D11B0364
-241AE3FB0674C4299EE3C4FD162F1E40E6425E3E11CA760A1AFB8D2E27CC70C5
-615BF53D9717E0332F020ABDBB793ECB04B7303F40685A0D8B29A4E2C6167BCD
-AA4565873E4A7E1AC131303800BB7E84F79AA98B7E792B8157FA38292BCD8949
-5E15ACE436C8BE29834F524552D810D2FB67017734AD4C03C73BD7C9841CA31C
-ACB7FB3464E39F61016235DA61ADA8710BCE5519767276D2242B757B3B0B5699
-935DAA1B4A0701AD24097B65D3769EA5E45508A6D2579A081F3173F0F32F1E28
-2EC97C05787A7BCADBEBC7A1E9504983E856E98145C3EA1296B9565998A60B37
-58BDA0A88ABF39136FD74EDD15DCF459489A567222871889DF6543CD1E90855B
-ADC971A6640670D14D5A2C369EE753676755568A45CE78BEB75DE98FD6A6105C
-81BD69680D82DBFC86A39F5EADEDF270D9757F982699F8A3ED83CD8F5E26374A
-82CB21947A0DBB6D7A6FC4F6ADF6F8CE74B7895AEE7F0C951F6AC2DEABC3A5E2
-38EB6D4FB4CA828E7984B0758B60E93291FA65BDA41BDD1AD3C890860A1626F8
-CA0C11872CB7C9E628A78F2E7EAFA7BF167CCDEEBE829BD3BD1302C0E4E37870
-313601E5C5CF14454CA69B3B5F2A38DF8F352848ACEE5F1045004BDFC92F534C
-6E00875001F682FBEEF952CD8DA111CA9DB3031DAB0D0D8A71F41AF4AE7E9BC8
-55BA6FF6FAC74294E1DC5F047600D3E9790A434F5AE586587E2355C6BC8F4122
-E46DA77C3BE64AC6535AEF02CA9A56C7D6A1525E565157FD5E981041BC4EF514
-CD2DFB705CFD64C9A237EB0C2EC52DE80DB36049C5921791852AA9761B870221
-75F9B6F780EA47027FEC5DC776DE29E6E446F8425969C2A1A772D0F80DB2ED3A
-12B279D3CDE0A3FBD24BC2F2BC54D522EA256139EE9281C54924042C6EEC4564
-27B3EC40268A5A7CD4BA5D279A8AE7E20F3132D0AC3798367D6C65D20F3CF20F
-E712E9D1C49EB2766BC242BA82FE2894B780773725B2BA465CE5EF5D246064DC
-29797C23D1C37356A111BD205AFC8678BA8F2EC47B2A4EF8DA50D34F075DB648
-44B346FFE6E7DDDAABF4386BF3AB848D548B2CEDB7AE775C2274ABA1708EDB5E
-3E67CDB15ACA37A8DE363BEDAB04E822A04436FBDA67C76A1A0BC48B71A1F3A9
-9EA7005A7F3939BA5B8C5272B7F11BA12CBE776981DDF6C614CE1A218973A98A
-EB3147C5BEACC6D85C0218D399AB8E6EF8C7DA136FA18CC47DBB6C8F4CC905E4
-7EE6F5246B76FE94E16C95E92125BEE0E5977582FBC5321C4D1B50BFB6B8CB40
-6DA97DB9C7085D38A7371ACA81217AFE2066BE751EEA53269D66A21E9EB85A82
-F924B6908295B8D3C2CB66E32BF4BEC8E5F914FD03A0229BC6C22661CA09E790
-79FC30E2A564561EDF97155EC22B17FC8C0E24BF95EB84FED35F15729BA9E65E
-EB7D617822F3759FC4BE5D26B8A81A86502CABCBEB2821F31C81289487A35B2C
-6634F1915D079B2510CBAD6B8A8A310FFB89C3DBF54835E2440EF380D5CD044D
-79C868C8E19833928C61A638C12B14764C2E1F3EBB7D53F6488CCA64BD46B121
-2EF4C820F77C36CD60881000957331905C3CAE890191646652584BDC25006454
-B7DD9D36CC5CE676CB05648FA49E0D4C40CF8A467DC3073F1BE6123231E4BFAA
-29D020A47CFA392063172C2D39388118D2B97A4D0B0FE56E8F5C75D5DA0670A9
-8518B93771382B5C9CAB5171A9B7E7BE3EDA56FB6F46BCF1D8A8F55E5DEB25C3
-120AF42C35A47212F61223E0F5DD9EBBD071E0E454CEEAD5E1AED7FE401135FE
-54FF2515FE7F2AC181F05681230F2ADFC21480178265377C0B863766F3A89EBA
-D5FDA711B2F2F7D0AF305603E515611515C03CE0D497F7009B15FDD3CF7B9BBB
-8774AF7295A5FB58326524CB2A5B2DACAEA5169D358F6DB97A059AF69368F85B
-637689ABACE3C095B5B5ECBED19406A241F0968E82FFB4E8B2DD8895A7D05413
-35471E17B3121C46DFE1F3393302541C9589089632A939336ADD5B2CEC8DFA77
-31A2F8034EBB20A451830E33233330851DB80D558FE1945A08F977FD569A7097
-DDC256C3BB5E0335A4E9FF1F59E458A23F4A8CC81A4A545BD85F86CC1E7DBAED
-BCF58249BE18C57546F2A2CA9BAEF5E8D0C5128307DE9698591DCBCFF4A45588
-3CD844FCF4D1B7D546D66B6E9A10F0475CF8A4425DB318762FB207AAD6A3AF2F
-18F8B93F0922D3130F2F34E309B03F50AC68ABC8959061BB7B67C09A947D258A
-5B5B318E80062317DEF35BD7ED949C408CC920CD22D36D7C6033DF960D539E2B
-8EA682A180C37F04528FA5069858C80EF05FEE3158F8B16EA9C6D0008F27D0E4
-9301620F7B635E985141CBE37D546A349B9EB1F0C2EE079A0758FD2F034DEE63
-A77F4905E3202EBFCBF5D9AF53194AFE947CF122C02F0223FFCE52C30C13ECA7
-741D9FB2D337992C1200E011B9D2BE0292D632EA63AE091B937B00CA429CD6FB
-D7E27B3C53133F3C860A0EFAC0C263822746022580664DA465C985EFA421D112
-25BD0B56DB824848F63412C8E26838415BE8840613DE90502764D49643990BF3
-913E895BC87FE2D45134910D9F2AED57E244FB907BA1EE1782EF6A1908D52EB8
-8A0E35712798D4AA803C95AA6A10E4A8F537C1A1B4BA4668D04DA0C3CB01EF27
-2D2FB81322FF42743B00A5B0A8D406DE4C93A10C73CA28FEA7E3D181886E708A
-D9C71530EE481BDB0DC7D5635615D2EA224398D73AA957D193D8D310C85E8988
-4F34BBE83B0937CDB02C06F09FE30E9D32611D7BB552F8CAA973546B52B039D2
-13C8CD65DF3E9220E12C475B486DDC9D1AE4AF17AB2B8BEFA630187D3617B938
-41721617F7F316402A65DD78B644FE2D3EC762FEF2F33A9DE36076FFFF7EE562
-1E1A2AA33889B1371F37AB9D21782745B0638EBAE39A6A91573F271CD97B1F2A
-F784155AC7B610456C284BB92C0F1B3BF42B112F0F069D15ADD414134EC80EAB
-B4BF36A66A43F756B609A29029C1A9683204FEA9B86F461555D654FF76D6DDE2
-A4B043BFB9A74D49BCC0F7FF07AE0445B5000696547B96FFB3C200768DCD28CC
-D168368EC0E5400710A8EB3320F0243E0F8A271FFE250A165AC3D0717EBE2572
-379F61940798C6BA81EB5B295150DE6AFE2CBDF32706C489203D1D0B99114063
-E3F46CC6F1E8D9885872A81C7D7ECE0E1D10B6A9C035557B9537EDC5D0012529
-4081E0FB641A94147642D1D1F09AC50BD39587C4FAAD1963151A42886F73CE86
-FF3E369046B5987DC6AC3FF490B2412614DAF252DF71C6382D9520EC24C6C80F
-32038BB8EE6F1F0653D3FE87028748A822CAE716E3BD16B401D405F5C0ABB7CF
-76209DFE817EC80AEFBB6AF4CDA68F1A9AEFC7093AD38E31106B54F878D34C36
-C05CFF435107489ACE0DC8F0669443BCBAD218BA35100DFC6967E8C5A5AE0FD4
-55A7B09E58547CDF8ECCF986BB4642E3DA6E5AAE8447CF15180CE44851BC5AB2
-AFDA9162E3F8EE5345A84AE8353F0ADB44AC1209AFF4D937B5B797B348429D95
-26AABACED222D29F01A36108B86F4B1B5BD8AA39DDCBFC834D684E3903F209ED
-2573806438DAA3A2B46FCDB66AFF13047A4B1221D1759B6E69A80F09012F107F
-154CB57D1FB3EBEDA7AA800F1A217B92A73A591A89DC43F2C58CC2D7A5CDF71D
-1DAAC77CDF41C6B305DB18C3ABCB9B36DE8522EEC89DC3B7CCB35B0AA89D1C43
-9F67A1E01AD73F77BD202D4E2520E4CB014F8147E0C01A2528E674AE656F8E50
-73148827D3A5C9CEF2C3B7788A0914332687E1468DE710546C7FB46E9D9BEE25
-E6ABAB831ACE7B5B8CA4339C98476ABB2B51D6394C6C8DD3A394588828CD7FDC
-4194B1EE61CDC06B1057E8BC62594F8F223167CA500F4FADDEEDCBC99778B482
-56DA1E7B5C09D1A6EBC77D7B527419A6235438CCCD2112D5536B80E3FB85839C
-DAE6F186D3099AED4817EFA52B7F568F6940CA90EB18F12E17B1E6942A12438A
-0E134923AE5F9ED242551FF8A746218BD100E7499EF45C0C873BE6AFBCFB2B21
-0D1355A6849EB0A3EDA9A5F7C7A1A42E1AE72CB34B7597D3EA0ED9348C49DE6D
-CBD1F63D6FAE6E7D46CF0D67C4201CDF6BAD0E1EBB264644B90C4B0F670DD266
-2DFCD60C2B28F1CF139D373675F6F30799E4B355229AEA6486DED99CF690C0EF
-A4DADA7E0E0AAD1CA0C6FB2F6FDC6E988EBAFCFD7A49DCB0AE7391EE980DEE6B
-7E63947C86B0B274A510814E5153EA73DFA9341796C27F88F76ADCEC27438B5E
-52E6A675FFECCF216D46716944628AF91F663E10A973F38507293C0D170B1F46
-5DB5158FE0288C667934D6F9574BA49DF45293D460A24A8DC1DC391ECBCF74DE
-109B067AE2E26EF0B7E2D94D3B70C712A92531D9CB97FB8300D047FC81DFFC50
-C86A58A7322DD04647D972236BD4B9170EF93C2C1E6779F26285B7C594244684
-BA6C28A87ED95CB5AFEDD99E7035DB8AA7D50A1FDBC56507F2DB7A83E569F69F
-97BC7B84626E6C5BFD743D5B333447BDD19B1D5E8581978E6184174D46652F64
-132CC85A954F7006FDB2E82A61E3625A18C067F82CEF40ED7574BE9C2688B25C
-DC95E3203506A0A9CBB17125086E0F1098E3B79176E11BA65F055706568E9319
-4572DD5CAB0E4C50984910FEE5818FF78F92C2054A1B7C556135836E902BA3A2
-596AE6A0D4355F8CFF05DBBF3FA66B8A7AEDE8337A2026893E03E65BD561E68D
-DA32592C403464C7CCAD732FC4F3E827891B4CC9D8D1C3D9829513A93A6B355B
-B89DF9194143FC8AB686B945D6E6FE3FA7C5096AF68CF78D2CC516D36BA30374
-AFEA624B77D557F06DAD638DCA11ABD1839850FFE5CD135E28B939659F815DBB
-465A8D53C87C8EDF1E9FEAAC316DB62E887D0F04ABE77F9A337855FB33E744E7
-373316512D9BEF04FBB2995E8AA887FCE7F0F7BDAB71C0CEA58E944D58AEE590
-E4DD89CEDA2EA32D8D99DDBD44567C9485F4BBA3540428CEFA9AC0F6BB177AE2
-6150A53365D9AA500F78DE6C04D5BD49B655A927FA217CD2DB0381CED30C03F2
-2912F274AFD2D3A219A71331FFB90DF76E0C24A157090BB8B3A9233E89E4AAF6
-3DB1591D03AA5200F0C73F534A1EB4484BFB861F323BE67330F9BAE3401FAA3D
-AC07A2CD5D10816C4A88E4B31E6DC79D757062DF3B506DABE5BD33B319B7AB11
-B92BA9C1C4C3B40CE4A6020E7A6363D879ED0884E550BB5AFF11F7328B25237F
-7CF530A97DC7EC462519E6D3EA80D32752FC08132F30DB72592F4520F10CEEF8
-185123CEF67B82E8604380D41BC0CC65BCE6DE08EEAAB28AF3D3311E405579AF
-01077188CC85297C76D9341C4002C123C8F00362FF6478BFC4D1B7CABD23330F
-77B2706BEDB00F3FA8C33BF5F21211AD68FF3AC9B4C34F6738F2D41A6BB8CBB7
-8AB0806A424C01997D029B9A3338BE99CF8FE6C39EA2FA98FB7BCFD7774085D6
-35BBABB6698D60C171CF51895DEE35F2C56694698A8301E86E93B19D02C3B5AB
-D2DB7BBE132843259C816E8795A19FAA736C0EAC5C487CB6312AE9E0748CD117
-3CC93892BC103760CAD3E1BB7BB548A78DA576C742DAA725DAB163826914F029
-30FAAEA08463BFE61B6CF30EE8F3DBBB6656D451A7D3DC90F1DC7DE683B0A0AF
-934E0587FC22B99D4ABE58B46919818D09F74389CFE25A3DF25B3ED6C21C3EB1
-538B282139B25CF35733F5840023E64C1662D2201F2875F0F08246A76ADB344F
-530B619148A2BF8F7C6554EDCEAFE8498BD27518E2C7910EF47E5F9A85D4D8F4
-D9ACE62FBFE34477E0ADB4BEAAC4FAE1DB32E022F1C9AFF04979EC82C9988493
-D4A6FA585A2827A7399D8EE9E358376E67B9C9EFBA4ED3F30C98C4A2098C7441
-BA86101856C3A60E1D0B1842162748E15163076C1300B1A59A8EDFF026986451
-9856D5DB23DD10046A42824F3953C87A67EE2D2F3EE62E8CD1512A4D18D9ADA2
-46EC9F0A186AC7783791EDC690F34D6308C7477C2FB5006E5254312AF4AB964D
-870E218598F552C0F26D7A1299982A0578090B984C1F11BB5D0C3A5386BDB016
-0BD5D2EDB71D3FB791FF33423C6B527FDFEA50DB07C4AA8F65B9AE2D7079EB58
-EDBFFFE5805D5E4D2D5DBE66F3B5F2EC864F69356976E51873EFD945DC5D33D4
-17842941F2861E93908852528BC23BD6FF56CF9094F9C80AFE957FA18225229B
-149DC5C15F421799834DEA3260EC1D93CD18C4A75D20DD24CB58BDA9185A8199
-ACD6562679E296B37051DE676E374163601F79685390D147A8CAEFDAF22D0BFC
-1858984471FF1690EA5916654BFBE10174B3CCC84F89805E609A61AC9C5CF960
-5BE2ECCD12E5DAE53FC55B77CDD2A9BA3592A007431F576C5DADF36D5C1427AD
-6189B8F415FAA1E38F4D04F2E8C6386E25C3BF311761D95F8688B68B5BBC1FB7
-D91400CD00EAD6BF646785E094D3ECFB8100BA65B665D6F5E8E35D2F5C3B3A57
-DF49B89D9151ECFF486567D35132F830E59CF04B8F38F00E9BD8EC4149591B0B
-26E4F598D58FB3315151A810C7109C8A77E9FDE6C0BF8C551437BFACB42464FE
-842F6792EF99F600C66D1204F8FE6288F1F8259A8358B4CA21C1B82DFB5AA997
-9FD878D6864CA660BD89DBAE38ADF821769D9DFFDDB4946F2DAB422F33458D0B
-999FE26D8023866BF38CC544129513D2B37665176E8B0F15C3554B699B59E1B5
-9EB0CB8A0CF137AF32A805821D2F5EF806D9DDE968CEA58B1DADFAF0BE960B68
-E124580F7C3BC4089D9865D0971CC45CE74868C8122CAE43B57E58A5A862D5B5
-751016CDCEC16222435B5E823F121DFF1D88245E745FD51F4E971DA916E6C8DB
-CC1B15755F72F5692A2C47AD1967E812F21563CF2A0F8274289BF22405AB8158
-73B8BB9AAAF846691CF20B058B800FE1C75D8FC586FBF3BE85F1B87073565DBE
-FC1DD2D7C3006FD775C2349DDF659D05224178173E8A7AF73F982C90750F8356
-BD2BC9AFA1DB2007B89D6387A97BA32AD4FC4BF559EA5FD2DC6412E8B460B251
-8A1CD242CE0BD3CE22A7F97834BBD4475E231794036D0040A8EAE9ACADFAAABD
-83EA88CBF0BB9CD0C3C60F5379FEA1FF57255DFA6CD97042BCC0C9CFF68E71B9
-59E6080A165B650DE75BC264B113A3D00EB5BCAA2F4E7B2F5BAC3162CF23BA3B
-E4C2D2AD908ABE5C63729DF4CAABB6B2987483B8BB39AB836B05E30B2AF3211A
-65CD7280C50427159F00E27094F7DF1482A0F5C11ACD1FA25174C78BC44084FA
-B83A8153875B85D1DED601875334A8F20819A018D1F05EE6D840331DE4CF5EA1
-9C1778E223D44F8F85D20C5D8B5B6EC8CC1773B7072122BDF4C41E0F66FD50D3
-0993E010D9DE243826BF3791DF41EF81B077C095BAF5A84D44AE4EF6AC3B5396
-32712CD96F96C4951D991765C2A80D4BBCFDCCBD87EC0677787C5DA8EA93F859
-8A0F9B2B2FDCEA5A22F19F0050EC0A6A4A1F164DE87F1F29B6D49A58D71EDB77
-A1E4D554685156F111E288F0CA0919364B7378DF77BBD2FF9EB451E106AF3279
-7982AA2A5A87C95D170F2CD52A37EE49193CCFFD6ADEDBB09A355B76C351DD5D
-1A345EF1AEB6AE1E0F97F775214137797E433D351A6DB5B7111643C283D24181
-D0E270296D43E11375325C95765C3C5665260A6DDFAF7DF22D248190C525946F
-B6B0ECF3175CB05B3FB54AA3629F910573037B8FA53F85FBCF6C702E36293661
-55E05060813F639DECA4E473CEC7B7542AF0ABC91F1A51B07EA37BBA4FF366F2
-88689B2414C8F2CC0E18C630B2DA735AAB8180F58A551535C34ABD8CCB1093F5
-D933E742D3B702572F06EBE5D60DA7AEE103E825868D663044338ADB3C9D1899
-D9974325D740DB84212971625B8E379471C5C90AADCF0A9AEB1D2D0C092373EE
-25F02A57DBC7E2973CCA7A6BDD71B32D81E970731F6B46436EC5DF7971150881
-90B48748B0C9E9BF661E3BF9BF428254095BE013C649C2E99CBE108437E64185
-EE4EA13FAAF2C823049C9EDF27B5558B3D94E21A246CAC4EADBE7E31AA3BAF46
-15EBBEBA067037F1FD1EDC9F9488AC031AEAC11EE61D9ACAFDCFCB2451B7D944
-89F148028EE70BF5550474B8C34474A38404E53B10C0B770619502A2DB4138B2
-4BA812344D3D86C1DD1FDFC25507CA39CC10BA327B7188B30177D2B49DA94740
-8FC3EF502B0B535BDF4A81DCC8B0FB99E9117351523E1ABFA0C2879EBA5B374D
-3CEE4C80264717EC5073908F8E60B704457C3F0C1D32A1B61E6F25D08C36C051
-2EA798E6BE78EDBAE978E9F41D87446F0D3F724F1BA22895465D091BFD8B6E7D
-BB3D4EFC2E8D59FEA35263C964529F9E0F1CDB2AC0DCA9BA134461602D22AC2A
-CFEE36E15CF4CE30D74BB5A98A96AB6D31E3D418797B2EBBBF0ABA03F20DDED0
-B437CF69A1066F5EDAD9C21DC18BC390E0DE088B82EEFC23BE67EC5EDD0BFAB4
-FBED26930AE2185C1FAF80B9596416522B0B615227330FA99659A375F261FFDC
-FCA94B360DFF79BAA8E856DDCDFC95DFA4F0778A4F4BD99BC43EF344CCE1FA95
-F0E7C74A0E38AFAF9AF2F7A4613E8ECE116018437555CD00451A28946AE8196D
-3CE6273620A0EB981DF43395E52FD05DE06C76AB5E8148BEE6A6AA07C945943A
-06C90FE2F5EFA4EF1B6DE6BFEDB6B673460D4B55452EF438AA0ACF7E9DACF826
-BF1C7EFD78F501EF65D3A77750464EA1C36BAE51DFDB1F6ACFFDAB646297889D
-EF18491F4BFAA9C2255D6D66D6E975C56436FA1291424C3A3FFB833285EB6118
-FE8AFE03F16A8C99DEAD2E987B97B9B6F5DEAEEB3418FBD95B0E0F8062D8B445
-7AF2917A3E50C1FD2CD917A4DCA5CEB841A393F12716FB067C4C431D3738C4CC
-616FEAE739955EBBF2388AA113249FDD3CB65614972EA2ECA678858EF2FD5A95
-D0161F05EBB9F859D155E7FF70B567BE42FDEF8AC8FD584BD6F3848121E02397
-DA00A73E52025070CF6D6C44CA0FFAAAA6EDB678306A3CE8D469F94B4511E4F3
-3581CA8695A0E5BB64116D8DD899837931DBA3862B69B38FFB6CCBF1D6199DFA
-4801D1007F9E4CF391406F0AB61352D6053A2C3A38BA40BDB894EB7EBC2DAB34
-BE2E082037DC7BCBCF8DED1852250412F6ECB9BEC20A04FC012D2F97159A979B
-71E19442DBA788E65CBE9ECE846FD307CE7103323FD49AC37565FD450B5B4662
-4381EBEBB98186F7C6DFDAA22AD161B30A48D6C8B233158A1EC56BE74188ED67
-DD8937011B01FB6F690B6EFA7C9416561682ED59D6067CF28827291915878663
-A2CF19D86B2AAD2476F03A1786D6072E9E14321CB4643C3586D8D3378E12CCE7
-EEAC5BF5478783F5600A46BD929BF75E254F5B9991ECE829CC0DA99C2DE73C8E
-A1438CFEC618F8239FCBFBA63C3CC68EF3C84D492EF39E428A4EF041FC7A034F
-8DBF169C96C7AAD7EF572EA9D8E7995AE9B5820918604E0245A58196E870C92C
-A4269B9F06A7945D516A8C1F571D2C658A9A95D02935628CF61C7E8E099E96A9
-A0CD9F497056AC91DBD40D589F463DFC63B665107EEDE9A7702B9002A4839612
-FD9B2CF0ED8B9E899B8A311435081E387998496097F860C70B0856217D31077F
-0628139533B6B19973D86231548E6D47E7167B1475063B8970391B9D1622D8F1
-CB1B46509E78AED81B437787B47B8711712239D43F2ADE009EF927548DF663D2
-21E2CB3AEA75D642BA7BB2DA3AE9191BBB1534EA87AF0C8BD688A01C8AEFD429
-59453063E34CD9378EF7DC4517E5007FF110C2AE71504E3BDCD9EBA1694C4785
-5A4022233893F25684FB1B5FB3967FDCDA0E19CBDFBA7F4AD16E91B798F38A0D
-0D9382A1A371236BEC93664BA5C5F96BF93FECF823D8F11D2BA4BD28396FEBE5
-5A65BFDA938F6D476F3D850A6A9E0576E82C72F0177076866FED31245B67B7D4
-2C09118B904D86972671B7F202EFA9FD9510419FC9589352E6004237B6140EE9
-5677B11B6F16C881CC0678BFC2A47F6F4EB7B86D424A28AF414D5D14AE8EB2B8
-CFBE634D951E20AF1C2E5461075CE0120C4C28AB55B3D1C7FA2C8DF5FDA22888
-3F91696288A283879D31036F9A7B0F1627BD7D3B1830DC3EA77BD4BEEBB66CDE
-AB448B52C9B7E44DC1121A01CD198D6C53E84117BB796508B053D85567C8DD3F
-2BA6C3EED05EF6CCC6FF9A6BFB1860B6E302982DDE2068781C15473CC0BA8C30
-10C7D99F3CCA2F31CBF0994DB5746F78021809AB116E7686907AF69AE07269C6
-3633795268FE168619CC3BD6CEEBCE16566E581FF7E2EED20253155807B7CC5F
-E3C3CEB9B6610CAE9A6CB710B84DC00E6E7D4F53A0F82FA4E9C9240578DAD3BE
-6FBC79391DBE1F06569C0D0DF69CEEB4C47C1C839041B828D6B8260C29009FAC
-3A166A6D04B47E4EC4C57EFFAD93596D486FB21E8CCAE06BB3BC4CB8E191B3C3
-5925792FFD99715ADFAF58605AEC477934BB2DA781713B740D3ECFB6903B9D0F
-BF0DDE2FBBC352312FECF74430C923C9E634CC8887973B949AD5232B0F674D52
-6500120AD24310F078117DCBC671F4C7885313A5F5579A639127C830A4BCD859
-832EAF9236FE60F0BBE3DE38F19E55F7CEF8D3CDB218A63A387A8B4F2B12380D
-09D39DBFE2D8C471047B36549DF83B517DD57EADD7B34476DA3974DFEE987759
-AA1E2EB8F835BE740FDB2DB6D5118E9082302065CB6E91A2F3C7B5657F12F842
-89B702DEAEB322FF63C34FDF5293CFAED441F7692B5FA225EDCF155BF3105E48
-7E6A3A99F68C20F5499CB9B26B5D7E915175F17B6D9D2B012906BFE07EA38F28
-EBEDD8E34246A7C6184FEE0E4CC01F5C6F8970DDCF67D3F7AF3E64E2E0EC0F85
-363953AE8A29969D71357EB11AC7E21DE2BE5723E8416A639ECFEA20D0042D72
-87E92A6EF2027C1C8ADF7788A169E06F50268D1AD9012DCB7965F9173C4995A4
-C1264D0AFF2A649B8DB2F0EE7CB5F74E0FFF03AB75E2A32BE4B1D4261EA69B5A
-7D0A4625CF33D5B9B13439BA2ABB30AB399211A7FAEACA25C721845795FCE18E
-C752871F1D5B2E8F42FB13E785ADF1612802979C374F124F1FB8F85D328F3A09
-1987C577078D35BBD1892C84DAA254000DE099F7220375BA244025221D83AE07
-767160AEB66FD0D8A9D1D29A68836F837C8149C2402C6E42C7AA1E51DB4701C8
-FF47C9D9B89191E914C0B5E2D464201C987856B5C8347CB567E86F2B040B6B4F
-15A09258EDC942844D997873259392890204CFCF0DDC475E846658E161204272
-2BD48A1032E05D73F49CF87C0B4AB361E0A8087D5BCBE2F1F4068B635BBFEA3A
-6595BEF5DF4F34F0375C89AC1F42D264C16E61B4861250873B67ABF0CA8CA846
-ED91961EF609560C74746062DCAF92A8EC4010BC9FCD79D7DBA48753F02363A6
-1A6BE1BC087E48C334DADA1F21C5BEB5C169517D1ECA54FB284C9919532BEFFA
-884961384205AC450A6329C27678C7AB2AE0BBDB3378F9F3CC026C48413B13D5
-EF8C2AEC6F34C44B7BA04D71971C62BE351560798D2FCA419BD75ED389044AC9
-E62AE8B3EBA2CB0826DFFD5D6270DD802CEE51E7C137217EB34094B44846EDBA
-0FA5BDEAFE7DE979FAB20CF48B28543AF71AE789D3CD910BA237E6D292C9DBDD
-078EE3101F557D5403ED2F73BA84E97541BAE26673D53250FBD8B67B16CE6682
-CCF3EB4DA7889B718063CED7EF8D4B97E12EF318DE2E0C9F5B439B85B038D979
-B442A57E96C0E0D3CFF2352361978F71ED74CF86738D0F8AD77ACD20CB9B305D
-52DA163086C39FD967DE099AF9798F59006DD0BCC8508410C13A626838192AD2
-EA130256AD24CFE5A1605C1F679CB7D030D76945370A7C2E6B045608CFE10D55
-19C6C9A84788ADF3EEB12D9742E04CD0E4633FAD0EE1DBE291C13EF093FB4C8A
-1BD8693178646959C4C9EEEA2EDCFBA5F31896B86636933A6F7DC43BA8196F28
-5487F3259CB21448E37B1708CEB1E1651C53BEAF0D09A17741E2B1B7870B431B
-9AF492A59351A536E15167D5F5E26BE73D66405775B956653D2B5B23A0B29D43
-24A5507583E35056011CB334A7FA08FC5BFB50819FC146515A069EBFD291C5FC
-E0AE26EA930F5DE0934EE1986AFC357FFEBF99CA22AD12086542E2DA9C2F3157
-39F1D7E591F392304DC264337262594A64B6EF4F9741D034B2C291AD19B7F13A
-4EBFE6A338443914BC6B81625C7140C817D39436B6AC4C2908603CC8D4642E52
-CA7A0B9CD1D230BE607A5FE89771E21B897F0BFB8C7A1315B554A4F036F8F50B
-4DB04A6FB17F9D6F86CA00F8621E2216683BD2BC4668091700BE1EDBF9377C7E
-A94482C1251D227466ACB8BCE5AED8578F0A4CBF78BA3D909D9096B2CC7E48E7
-E346355C3455C20A80A93F1492C285C427581C7D10A5459FA997C96F9F51ABA4
-7D28A48CC9E59B8D8476F6A3AC1CBA05DEE690F33E5A75C2290CFBA105FE38F9
-1EB9E309AF3F7A1A44273B2BD0FFEEBEA9ECA9F60E4008F83ACD56078C698C8C
-95BDA63B876CD63990B23F1EF7E4B6FCAFE47C62EE9AEF014071117FC1851F61
-2514BEB09DE651B7AEF1716B7D4C49609F125050559DCC289D410CD59B4AB0ED
-554449BF070327E9822A863430F59444AD4B6B91C88A7DC58FF1701EB2CA81D7
-2DBA5B749716E09CCD9CB8DCF747546F24967985F4CC7B052FCE186DF5976864
-F465517D8F479192285345CF7401073D5DBB5878EC2C6DCD11E94A0649CB320A
-61CDB0D6A0AE01F4CEDA46094F100F58B7F7BD9A1C40610B5B2C08193B3CB9AE
-AD7BE2796D9B40A9602282EF0DF395FC8A27CE9B880C73A7AA7B9498324669B9
-9BCA199EBF63D883FDB77ED213A8FD450633D1DD9AAE6534E3672F4795F49713
-72C1D053F5BFFA6093FDAC3F7527426740B53193DBFA84375E2F697ECCC2AF76
-C8CA746B032C293989FB9ED210703244493EA7C3A01CADDF218D3FB543DFA5BD
-0296333039C5AE67AF1D3FB1491E54B4631B65806A30B279AF8F82A8222BEDED
-44A451B84EB62FF653AE3C3C1FAE373FDFCF5EC38F6736518BB69B250797FA03
-6D4843E535F9BB28830230482FC058A1001E061552B4E00386F048883BEB18AB
-0F1799221D3AB37963487BDBD9B298500606512C282DAF37BAD73D5402252F47
-8F30C91E42B4A5D2F2DB3E750D3189CE6613EC3DD73B055C
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
-%%BeginFont: SFBX1440
-%!FontType1-1.0: SFBX1440 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ecbx1440, tcbx1440, labx1440, lbbx1440, lcbx1440, rxbx1440.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Bold Extended) def
-/FamilyName (Computer Modern) def
-/ItalicAngle 0 def
-/isFixedPitch false def
-/Weight (Bold) def
-end readonly def
-/FontName /SFBX1440 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-218 -316 1652 915}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1D9F9948B28E5C
-88B31806AF1433ACB13EE555D069E50649D3C93032500DE92DCEF42B7487E4A4
-1ABF7F6C8F177A4CF5776AFDE02721C8B9F69A7CA769B2466EB4501A7E5683FC
-58FFB0982039E9154719C1C110840B2DC207902F8EE3E83464C763A03C52F60D
-D7194DA5888BCAFEECA5C0AC8DE6DCA956F1D0E6AABAB6E20F7B64BBC9871543
-D62E73F596D732C3A412E916A3EDADAC745BED5D2176C14AF05DC28DBEF5C944
-FDFFD52D98A35990F8D5FE21D5DCF5C9900FAFFB698C14E56B6667CF8734534D
-8698ABFC9B4BE68E86CC30704F0CE920EF1B2B0F3A73E6FB24B20F9702ED522D
-C0854E870B8B81B62B48650AA5E74D2F06FC2BB2E06DAE38B8F0D829E2240B76
-CB76085648CBE820C02A50638D84251325835B79D82034373114FA691B029ED3
-7E265B00258A76B193EC155C0A4DE5338B95073EFD9CE428E8C7D9F8CA3819F6
-59291A239C1CBB8629179F79B794CC64ADDCC520647C90B2AC97E3129FFE6A47
-71E86300F2FB20F2CE0D6482A2F94630EBE822C060B15F1B57B51C82D4AC05CE
-B552810FFF3EABE30E288BF601AE1003C0DCB4B555167DB1E6F4004684B76258
-726C1DE83C45C8CFF7EB05B68EEF717FB397BEC159B148060F15EC1B9269A780
-56FBBFA94D7E8333173E4BA3BFE2854107F555F08E9105A080F1DC512EDC2A15
-A74776E3A18FAB7C1F64921B8A976D7E279395659E0886ADFECDBFF558F1E4CA
-70E9A40AEA239D0DA342BBCD975C13315C3951A6527B3BB9AD87064C0B4A3C2E
-FE1FE92EF6EFE9DDA2D709D94E00EF85C03F169FF99CCABCE91F2140BA287866
-E237994F72E705AA7185CEB4BE424923A196FF49955CE55BE7066690E780E3B8
-76EACEA86F719D6327C049905B70F9F72252A06126C8B4A56669AE182EF98465
-4059FA3C23B13593FE6A5DB1C5C2E7B9BA528C4E0CB9D1B93019A8E265824344
-86947FDEE9A49733A27ED7F51ADE0FD2A113DD2612350DEBB93EFEDAF6F39C6F
-ABA7F3D9349EDAE7EEFC31F9D510418FF169EE4D6B05905B96130EE6FA2DB817
-49EE49A4F4C49FDAF4F61073438D53D676F5D5ADA65791E20C3E433BE062BF8B
-9D022DE963F8DDA6A8CA1A304AA20C31A589D07090EDDB762A308F74E12C8424
-24E029E5AA85A8D7039EB206F025EE75EF233DF666CBD0FE4F0C4106E016CCBC
-73C481D62BE2CD71103CC54D60E4E66AF7CC62795466A3E7B1A94AB4E7D377F6
-B7BB47F307D72302B8F94274D83EF5C41C3C5F8114B46CCA0E57EB32802E5416
-2EED9743461D2D1A76E3AEEDCBB9185700010921FBE9A3BF6AFBF1942787A468
-FA39B093E080B08F124A61528B5C6434FFEF6D68C98B9F1C3F5C60ED024F57E8
-2DD0F836312FA51F866D49187B3E2A2915E0454A4AA688165089897077D8C442
-3D10F8A2CE50554183F312A7BC87D5C3EE7287DA937B474209957BD46971F5F6
-EF5B5ED47CD8B004B57C3F8810014C31481600E2BD4D7B418A019F3A92B7D92D
-3BE4E7795410423165EB84744390FF2A6C0A69DB32F2039182AAB2696F59551E
-A794895BA40F8AD7CEA83C899387E2A5C860D9EAD6AB9E2498BF607FC96D2ECF
-92AD53351FA9A291FC9CC8C8B191298B1DE626D05C96A5EAC0693CE5DF610DBA
-35BE10A0BDC92DE2D075CC9EA0B352F70D344305DE698B13F0EE51BB8C838848
-058B25DCA0273105F11543E86C215CE9B0DB507A58B5B98FC3BB678BEBCDFB46
-C68793400B20E042BA55E2A3356EAB836DAC4800C97EEA153A44CF4C4C0FA45C
-5EB8C4C9824EF4E9CF895B8BF91443591A8845AA3D9E7850037241E18CC0FDE3
-14BC8E0ABDFEAD85B5A4BA814CA2B258558D55DB22566FCB135A4E492B3816CD
-777C55A00BCE19F67E919617D5FE5382E07A0335AC8324405024951654F4D037
-DF90A94D5F72455ED72162D199CCC38215CE324D0488F9574E6263837E6C89C6
-B147D972BE838A53674134236CBBB25691DEE7635631DA60F55432929A1C0816
-9CB9C24E2062F345A33653C64546E560F1515876812BF0CDBB53AF8F8017D43C
-472CC042D06C6CF00D11367B38D977823C021047D0CA9A4CCCB636E923D56791
-014712DD21E2AC4B36F2C44A99FEE02231973454E506A7EDA19FF225BA338890
-C5E4C89C600A19B44DAFBD70D9D22EB3E9292F3ED47688F7DDC03516C5EE15BD
-E294CC18F968DCA42CEE062184CEFC151AC9B70B321CE632A9134E57DC364AEF
-8D56EBB2809C91FF3FD1322AA99B6390DD9AA79B27397F787290D7FF8C677705
-7D96CFB98975BCEA1293C2D4F168426A80EB406A67AB1E075F05481E39E7D0C8
-B621DCD49E8597360265F1D80A2EEE072875ADA58EE90965EB0E987C0B3B7917
-BA23FE14C2AADE06B13BD007E3776FE26688D3AE88D250DC6A85C3FF736F7D09
-6DC25761E86AFDE134B1223D2A02F6922A1E6C0928734867CF629CE465DA20E5
-5FA2C6A6B1F946BCB7EF85045B2B1E29781C91E02F43C1D0E4C1A6F0FC474330
-D5548FC854AF646F86F1A125516E25FD221A20181680F53ED87DD09D744CBD3C
-6576252E726D201916D593A35C00F1073FEBD4D4A0A76151A9471489A27E9CF6
-405EE4C86F34E7E66D3F9AF497C0E16231807435E72A74B9B5C4BA8889012BF8
-40FD65270EF8EB3A1425BDC5BCF4C85CCF00A1D59BA4667982D2224354EF7FE3
-F3841E13D4F36E015D90333A175C8D8DE89E25D510AB158618CFA2D579FC5C30
-27341ECBD768AE5844558FC1C5B080C962D5D7BDEACB02BDCF20465A8A79F72C
-444B2D7915D902725939390051529D3A80BC3FBEFCE09EE1974F6CA604752952
-32BF2BBDD15216C57251A94A2E7348F3DFB5B8FA36670B1438E6A168F565A5CD
-E781D8908FEC9886FA4B0072557C5EC4D1F91FB39541B8757874D2BE4842AA01
-2D8F4F735C79C8251FAF27472437EB991C97AB40F7A50968EF23A47A2494352A
-4EBBE0BE0ACA51F2AF6CE3C6EC2110159D662590BA16F111B283D212732D8DAE
-5A86550E0FC62990F3A8774A6880960BF2869E3CB846CC82BA6CA3B20B1E56A4
-6BDA417FE127C21585D66F95FAF7D1E9752C8D3B41E0A123FBBDE22F8187AF34
-646FEBD88F13134F93BF24ACB6FAAEAE69863F1B01521E754D9086BFA198297E
-D08DD57201859FB92EA58FD6661205683F9BC9C74EE0BC58AC36C802A06B3A54
-5B9D3778C5DE154C7D677AD25547888AA4DA562C245D9611D6B9A0F43D1D2724
-3FCA3AC2A85AE8B0F4C743CCAA43EFD1439B4E4F0634451D086A7F44262EEDB1
-754D92D4FCF6767209C3DD2C4E988752AF6C7189714F48484F0C032E3F0B911B
-A2946D40D26538C0A2FE6FF83B554B290734A845FEAB6923FA5B4BAAFB29F046
-14DDA7052FF516185055E36717092CA78B984ADD80D97CF969EBB7BE3D9AF57B
-7CC30B6CE0F4A20B0352B2CB4C6D9B48624A4E81527F6BEB58814CAA58557A3B
-331EA44FA926093CEB9775B5F46CB4228D472AE283F5507F6A97549A6281584F
-024023060F377820DA5991797492318B4A7FB9BDB94221EF653D3B19FD733028
-1523A24D3FE3D8A87EC7D1C2012EFA8553B0ECA1E53FA0604F07F199DF340E05
-78AF13C8BB4B01F056552345D69417AF66307EA431D1DD4AC2CE36F0C62099F2
-29A909F8C89D2FD614D0A1C73129BA80F98D57358C5A6A2BE8F779FBFEC09764
-D216BE0194193F12F5586AD94A9B7A7F52C5226042107AAEEDC19442FBDD8350
-3D108C1D2A535C76F2015EACCDA0533E943977A5952997A76EE71BD8315FD944
-2C290FABA1C9270D3BA6137B67316819E3C86A6D4BC4D1CA6AB363C5B025F48C
-20EA921AF6B8A0FE01D023CDFD9F2FF79929CAA374AA5BD5B16A244B6353F10B
-AE5F4A5D720BBACB948F8A484DB1BA09AADF05EF93D978075598F37DF29454BB
-F727ABA4802F0818924031DEBDAA8BACC3A9198798B7A3A82E3FEFCD34A540C8
-FB9616F9CFCB7E8EA5467758F590CF4C75851E8ACA14E5FD6BA44209BF5E3A4B
-A9E7582D800DA6B4E644F5AFF9BDE1D94746B56099CF4C69DD98887B0558D80F
-6AB73672D36BFF375543122059CCD4972FDD5A13226B636F31A9670EB8ED6BB2
-F154C62CC43CFC0992B53CED0B6E1698FDBA922439D31B485997AF2FA2172F2F
-A52264F8F41A202FCFFF3D4F59EE2B52D2DF34CB3032D235AC8D305F677FF348
-E8ED022BC8896E1F0D19DA566E1A005AA9FF5890A3EF59251992896E2DACB179
-2DA8AA542CF25DC62707F8197943268BF6C4EE974A29E11E616206524AE42399
-5F527A2F37D55A4BA4FB7C83E095AE14BC3576B74813C32CAAE86DA2CCA4CA4B
-67BDF25AD0563924032DB576103CE40DDC83CCF7770E6E7C59C4558FA322B3B7
-2F00014A634554C3C0157825F1BE1F15AA3302B07DB3D998AA3DF32558EBA96C
-17EE5BFD98C6F798796C3B32AD100A7AABBF9CEDB3F956010D4F44273492DDC4
-3003C0E99AD88DCA692BB289A3160110CD44E8B9911569BBE5859C5D5E32E767
-BF3B2DCE86D087063159E197F46AAE7CE33A000E9606C7FFAE669141EEC6706E
-FB1092E65F6D8D4DA45DE6FBF64947CFB2BE1DA039D5234B380545252B0FCF63
-F4D1AC55E1D63AD86FF3B1EDE08D8E0531224B173C3D95DDEEBEF6C21F32802E
-7B644F74737BB4D418C8D726BD0069D63A29995C8F1A10B2C2DD83360B845F8F
-777B7AB59559AC79BDA3CF37ECD8E5A8A722A37AA9E2BBAFD0DFF297412F05BE
-0ED66AD153091804325EDBBB42CB75B6B0387037465E8326ACE6F0EE58D3E084
-1829EEF6296BD35F40ECD773CC32F9177051B66626037F2EF8F72D3E8810F44C
-1F90A29F713C4B6784C28130E159196D62685E0BB74FA8D305566BAB9535BCEC
-11888D480C4FFBAA2913871A921E3786DE1A12257A2F80BFB32FBF06EF866BDC
-2078EDA35B3EF74B76F7BC2334609D8770C72038D2441924CC860D5D6ADE6ABA
-C1A2B9F1957D2BC023287E0586C1DE490362FAF9F6F9DC2727A6C59FB2B5D964
-FE2285E31989960E6FF2AE617BD0942BCA05F9EC6EDDC6AEA463308DCF934F95
-47239ECB8F2E788BEBF2316DB4434CF4778BA8A08F81174FFBC7909AF179689B
-20B21F6CC7A175FEABDA80C9F12A93F017BA002DC0100066E149089669FC652E
-DC347D8345AD1FDCAFB9194886DE76368C58A3A0E2B7EE5C291BF7DC9D492ED2
-034880F94B19FBAFCC9140BA35F609878F63563690FB6616CF4F561C0F16F1B4
-0123114AF5F6119F3E31DF844B80FD932ECA2B1FEFDE6DF002F020CE5552EDD5
-96640576111071F9842E588E8A53FFE7F6E0C73B532238190F81728C8E84AA50
-34CA2A83C89317C2C12E0849D0730493F2B71BCF385A9A7F1371490BD74E5555
-4E8CF3E58A1F64F68659A329118D5AE4A04B529CC5FF1D10005BAD9127E3DF9F
-89CD1DF2EFBC61DE2167A4EAC0BBB553D2E25F739057AE5FF0400536C96ED9B1
-3E2D62C6373B30B200B46E02CE575D7548424E8A62509515B1F8D4A203B55606
-3CABDEECA106FFADFC82AD0F108B53BA73F703D0EFA348DE07C687E6AA0A1A6E
-8D7EABA86EC05EB9182E8CE99206EC7058C6E834DB285C80DB394CBBC16C8D8C
-BF96C549535FF126795B4815AA6C81BB02BDAC98F463F9F2DB713F617DB098BC
-D2C0A21B60BE57B6E9FC564DCEF51473A34B1180C87FDB21B1106FC1AB1434BE
-0F486BEBD3ECCB35189CDD7CDE672342B98C8B6DF5674D6A259A56F4C16261D6
-2BF54A98653BC12D34082E154839D2D146296AA6AB6EE175A70D1B7E169CC492
-0ED7DD0EA7E721B24437AAD1B71850694AE73296A0548CD56785013A5C6A7C57
-8242F9C073D5C913A9DC12FE9C7A00AE3900BB5282962120BAAAE8825552418B
-A6EF605546465D1D51CF44DEBB3177037AF0A01B8533E61CE4EDBF519D72A09A
-9F65D4BE9EA9D8BE9CEABA2FA6652BAE2A60CC8E3DB2F96FD40D8CEFA73AB0C9
-2DE2D075CC9EA0B352F70D3443024DB75306E86948992EA2F55881B9BC5D665D
-E316B46FA1C7B9BD37D974AC8B12D710E9F234815612041D65F7AB542C1FFFE3
-D303687A70056A21792FC0CAA7A490C010EF2354760171613751436F61169344
-F16D65F08323792D55018D00466D467D451A5EA9CDAA07C11E9848171A2060E1
-F47F0B7609CC7E46B115C9D6D6FBE5DB269D6C785041CF4C252DBB92F6103E5C
-F27544A9A4DA9C733CBAA2104C13D509344199297288159243942BDB4B57EF7E
-58F7B026929CA4D6209472C58851280518BBF10BC64AA63302CAECCC09C46AB1
-192DCEF6D7E7BD3D0CA4E480D6327B3A5608D50778A51145669DA65C070D9E60
-E0A797E0EFBF9FCA57130803563596ECE28F6C40CD614F18EAA944673BADB4E7
-20E5D872AAAA47A65D325F70930E8D7DA817AB20E2F5767F2497968B6F19CAE5
-CA70E18DDBED0789AC6FA67A329BFF8DC7D9233840841431FD101E684692AB6A
-20102DE05AE4CF51C7AF1347F5A1C8768CBEE53402787A22BF5DA37F4B3EEAA7
-2C0E4537AA133EECCB6D285EAB4720FCF2FC99376EBBE20F6354928D3870F6E3
-07F7EEFB23493FFC0733B474B943DF0EA5ACCE8ADF6D1AEA39EE9FDC2A1223CA
-6D6776B9E4A7AA577DBB49F1DC54CC0994D3927A26BCFC59BEE455F29C564B60
-FA5C65BF595737280992EA0CA133296F5544899E9BC19773B1F7C9FA10B3A52A
-D51618595AB6D1FC6EAD553A520F2676A88DB50E260794595C7AFA244C9DB0E9
-9A3098954BBC19648EBDD8C739C68E778FCEB19755D84E02F4D57224CD9813AF
-1D7FCCE72138258FE2EADCC25BFDFC9F6BC27D09621A5C5E9822E8CCF89283F2
-26681393A95422DC7897E3FD02939B72BE23C90B0192438832D2963055947FC1
-067D5EBBCC34A8424B1B7F820C3863CDA8AC53C3E9B70C22F4B2BE684B749A1D
-5F47814A253DA746B96C3013D38EFB1B705ACD02BED2868524C4B7F7EBE4C9A8
-1AC251A26EF66A325D2590889763C0BB94D94C79362041DC8E6923B21CC19F58
-1EC026DE5DB104A8F2391DB2EC4704E4C7DB807BBCF3CC3A51C28763E7D96C7E
-879EB79905E020B6A3F62B37E30213275A6BB5ADEA1F68825054C17452983D4D
-DF9CF1A646DAF4C199AD347F880CF434F9D47FEFD2A56C190D816C4CFCD5941E
-1ACF6A13BABB9017E6E32546DA2CBB3D700532353A0A09EAFD6CD4620F24BB20
-6B04189D3793748591978319C613B7CF53983E67FC1E1E54A9DEF9CE726F3EF4
-25D14BB8004C5D0272CFD969120081D57AF688617314B6294A8BD979D0E18AC3
-194C8A46D164857F29AC8DC0F34527ECA7D071B372032A0A2203C66B672C3C04
-B87D64AA24788C2DD47F3EEA2CAF5D87C2BF5A1360D3887EA695AC8D1190BA07
-19EE75F37FE348A344A81F1C9434AB91F771A43E794647CF42873A11216F1AB9
-FDAB2AB6C754BA721FCA3CDC3DD7E469B37CE1EB1D1369A4F7D86AF87683EB1C
-5E2D089DEC3F27752170482765960AA313ACE31F06B8DF8A8717C41296075286
-EC52EC611FED9B67011D26A5B089D2FA6D5F95637897D9F07AC6BDC79702571F
-5CD690DF2B3904A6D968D66BA2F252EAF13ED8DFED86DE9A50266375C4A16CA4
-5AD99C6F46F4FEA9D490254D0B8B890E332E065FC825D15C8042ABAE0FE6B7FF
-C9E74AB677EF964F1B2C75F19ADCA0383AA86B2CE30AD8442D0D5BE930B51F65
-5D426F0258AD3AF3762B10F34C6E09398C197F4AED4B02C50A9C7BEC3EB7D8AF
-04516D0A58BF46BDD0B08A487186EBD24ECEE90D6B327A49AAB860397BC02A2F
-6319B8DC5410786F5F980817FB5C3DFD8EC23ABB784AE1B93C6BA9E500D12BD0
-9D01776436F2979F3EE368F0F87EBA74FFAC047CB1E113C4BB90C43C27E56990
-C6266654BE466F7F65FF8022545893B42918ACD45660016B2865C0D3E47B18B2
-A77609A5D2B18E3AA351B5A5BDB53A9752A2F8ACF2221AD60D8B22DB6384862E
-6B822DB60B75370E3098DB08BE8A70B0B58FA824CB1132A858400E64626B6B18
-23B60F897C57D8C0C83854D45F2EE5368A9E6D98EE5C2FFADAA076D0238E90CE
-57E74E9D32600C3B7ED4086C8FCC3A8318A9302FCF2021B83E6DA70C0C99CA2C
-AC35CEE42814C9CB5EE2434F6D77319964639CAB6F918B521D4937B828C2FBC5
-D75A7FC59B06C2972A7A2C21BD5F26752BA385333CEAE62B18F8B7C2226896C5
-6FD93713226D0A59D3F62D908AD571BB330A7A81EA1D38E208A7DA5DBC09AD0D
-8549341C97D75B3BFE1026819B52AAAD08987E79FF608A2575B8B4447857A30E
-F5E29C75198B3502927A6357657E1EFA718B04F89D0C92DE6592FEC3A7904B25
-E8F13FFB675BDD72726715B7672296E2823BC2C72D57F5D625228E8899862082
-5E5DEB864CA08B2D4F08E7A6707AB7328908FFF44A8B6B3FD5F4AE9C33C6CE5B
-1CA3D4F3A0DD6BC7FDA232425F6BC550EBC6F4D7157AC2B3C51C3B43EDB59353
-C3AD6E4ED6FF8D4B2054A8A2DCF72D6E53197F7BF6793C6C5F94E518AD693D9B
-D825BA5E2E148DB8135259BE7A2B30104B9B29ED568DF576EE7F9745A93A475E
-BFCEC10B11EE0303EBF47707ECA0EA73E1EA8C244C6F1FB0B2D4971F24421D15
-82EA2143BD718FBC25D1458F1D6454D0B1E18027FC4E025334A0B67127E4A11B
-C3DE5341C6E2DC7689796749F1D31ED0007E952D15DC23F217A218623BF9A149
-3D6BBC92804715D15EAB09AA2066A46A548EC53C567618F86E1B2D41867F2125
-00FCF22375719E96286C44547C33373105AE0E871939D02873061B41E8800AB0
-0ACB4C4E8426E4A1D3745B85CF550FE0561561626D33617426738916FCE32FD0
-C0D0726F542EE02E1853473BBB13471F941EC4348F8A47251F5B90A8BD181B01
-D12E148B3C4F22C866D8A0180E5676683D488BD2B13810A80AC610FA22DA7709
-42EB0D3F839A019200746DA3FCE6BD16E0B71E4D72FC1ED751488FBCBC196D14
-CE1D4DBF68F87FF65D712369BE1FB27F04E1BF56BD94EE5A645BBA7813F98DBD
-D94794794A08724F976D788157F92E6A39E5CDDB2C2BD14323C7511828EEDE84
-4A1F915890069ECFF80A655017ACF73F4900B22B2EA07EDD6AA349720177E3F5
-B4555EBD9C95B09208872E72AFBD70D9D22EB3E9292F3A8000D5EBC6BDC8417D
-C9736A3A5009F8ADED7347DC1B49DA9005744BBF9CD44C4946901986D81A6703
-A43E43A8491373352251F2CC97EE45B95F25469CFC69F443133F64D3FE06D833
-6A7F8C73AC819FCD5879179D17CB5100F73620FC5E9646094C740B89626C2CA6
-A8D35E94283B20AF70088E031574FBC64F7EBB0D1CF4D0983BA3E2095F15EF46
-277703A7262419F77B452D11BCF43C8A30F8927D223D5752A6F6A7A22B1E79D2
-E6258C0A799F5D5F71E41E7FF4731BB6385AF7AC4A31660EE294C4EFFEF96961
-62D5E63BED7A26EBCC92748B548A1D0CE72227D78A20B22F15AF23BB70DB99A5
-79EC88E8BA13A7B8DBB6040E07D6CF5DFE97F0350980004263CC8877906845D2
-43DC0167B40150C337CD600BCEEA49E2AE83C19E45C3C94DF43F771986154128
-FF270D5C81BDA1A9E1302F69FD2FA841F2A90B208F4F0C823FEA1A509E8C911E
-20C54625CC9E12C44829209E67A14CF35A06A1EEE241876108A66876E209818D
-0CE088754032317DBACBF1F0E7E89F92C55E0DDB42EC76756BAF902B8D65A3C1
-83E6C3DFE282FDC5512B75228E70132B4B5FF051501F581F21AE095296988C32
-170ADEE55684051D476A5230FAFDEFA9CDDF1BA46083F1DAC8EA472D0BE425CB
-951677D71E6B6C1C3405C4E97763B354C220227D765CDEDD65CD119F97268907
-AC9E31BEF927E571D90AF7E77D6924521843A12A491E774EB8849FA1775336E9
-A76DF04E27D2A8C4365BD1E7D40BFED18F51EC704293A2D38CC6490326117E11
-1B592701C02026181F8FB67C9AEF7F5F87F0ECA8AEC7F5FFFF60D2D3A2CF45C1
-8D1DE6E4357CD98F9CF0363000573026FD572C2591DADEBAC1ADA3DC26D77EA9
-BD91B1E6E6B7159D03943C0FEC7288B07A530E4E2AA8EB94830D582DAA0E393C
-9CBBCC3304D5EBD32BFC296E9E2EC7D26069399999CF1CAF479526CEE1A51AF1
-286DB7DCE087C6E8F683B4D637C70514A3FE524F1D370B28DB6C7E6757E74C40
-3966D0FC1770164273B023CE921B27A0F732EEF21AF015CD502F8FAEB4AFA2DE
-7A4F86CB3511004549A91A4D01D469B990F68784D5D76AECE35F32AE20D6FBE5
-5A867B35C3486D00A5941DAEC733E34F7EC597F9E51B8ADF515DCF95E1C1BCC3
-2B6E3D6C1D8D72028B38DD56DD19DB4920F0B8EDA4236F2140E3C7246BEFCA59
-058620D20DC9E964094F9572C6947FFE7F8A67E78A412846AAF99F6432BF22BD
-8E38168FD327996198CA0BD62025B18894A854816928A70877FACFCBE01B479D
-35FC6543A55AAE8B8E5DDE11742F3526336D19861EFDF62604F4459A725888D5
-40FF922F2E230880F9B4732D92BF326C93EF78A741F33C05B536E8A261D42541
-141BED166EA9972F0DA7E17EAD1438FBF0BD10A5EAE4F3AA6154776C04921FFE
-C808630E4959DFCBF48583D0F506A80F6CE267095F20E0157EDE32F7306FC510
-9E9B82D49241BA31AA6FD2A3147460D6652EE135F41F3D4DF71C8733A6BDED1F
-A6599D85EB7D3520187287FCFB9DE9652139BCFF47D5FF7EA0C9299D8264EF75
-B074C0D09FF870058252DCB98F0B82A22191BBF5E844D33992B77FD5465C5F86
-2365912A6F1A096B83DEE05DA44B14F667B66958B8607BCB4A3CD42FDFA83E04
-0D218B2ABF7415F0C8C7C42C5BE575F35FA041022BC39F96901E870F2A99727F
-422B9DE8019687B6DA4FE510CBA51D8EFF47001442E1881576241C445EB8A775
-28DB431CC384CC3056213447475CB38C7A634F0F59DA5E42054ED0BFAF257293
-D1C97721CCD5B23C889833A9F19277013D89DC6BB13F37C3902F0EA39A778405
-729FA64B31BA789C5F12B6186491AC8F8E86E7ED3B5537732964C054592F4504
-28E8EF8D5806C643A8DD9562843B44CF9E118F8AE0E11915A9AC3A3E28660653
-E130D1B67B2952D41647F8AAB650AA5D6961A855BA0A223B94F37DB212B481BC
-86FEADCEAF1B833AFDB4BBAFBB02C101F62C24FA2BDD8BB304DD76E088EB464D
-DE4EAF62DA53E442A214481C40C737920F27AD208D73660A5E192DC2FD59AFE2
-BA5E3C41EC046CC3AF9BE96507102DE80EA9FE08D50A1618AF6D25ABA53D20CA
-08E41336016AAFA30970124211829E7332C090BF144C4DF8A023A37D8C7CED05
-7A56657DE220EC3C7A4495E79EA70AB1288DEBCE8AAE26FC92FDB92492DC9FF9
-3B5B17B5785482A577FF8B9D7CA04798EB5270B89D4C10114DEA1E2280D53137
-2163C947A4585876A5FE591ECF97AAE832AE56F29DD74CADC12D2B0A1236A9A2
-3271148BE4C58BE707FD277A265473BFAF99632083D34FBF011B53CB86D76754
-EFCCB35F92C8E0FE3E1345C0B29C55D4AFEE09D23E4FA1D036E199AE43740CE4
-C68F4E30ED050A4DF59C547C662B898F653305C0A3A0EB26BEC9D164FABD6E0D
-CEEDC405D5F4209598D1BF46C9D0986C34C08358A2C0AE6B18BC3B645F2882D0
-AA9A795BED8C35342DF7E95C56007922C46FE8971B81C555C9877459E17F88BD
-1AC0D43F1AA6550592055A9B44EF7FDC49297465AF931B313168B5E91FEA3E81
-108B19009B3A8AC756F0843AA6CEB0C54FD6770499060FC8F91369FF3E6B4DC5
-A089CB7A1CD5A3E4CD9AF2A396F2F3C6AA6CC767360DB84D20BF831737E6C856
-B07350100C49C8F660952474944B025266C0705E278A51FB608112267C75E02B
-E4192A75D90F43FF3340E34526A6639C45A949627DC528813437A0B89250FD36
-D0605470D52C1CF767595670D82F5E017BCA5A3E256F7339C0CFD82F9975D946
-F5C0721154CC2FC7E68C5434949A65C90F6C30E58DE3AE6D6062FF81CB388A15
-FAD5C938189870AB14F58909271C4BA31B68DC43875B3416729E4144860F483D
-2CCA10261512EF7EFEE399F8DFB0D5F1B6381728B0445301771208D54EEF81B8
-C90E71F6DA858BB65821D74880A8B9D20BC2925DEC67311DBA920DCDA36F0BC8
-06F4206253C2DA56406FB0D0E5F67CAAA56F5F5AF989A1D8B01FAECB1596066A
-358E0E25A0732B430D997E287E5C3D2929125EFB9B17F2D3ABC27D05B79BE843
-4DBE405F44ABB8C1529CD42158ED6F9E16660C8C03A111BD9BD87A1BE4D3CA0B
-358B5E56BE56A6A7AF5936425746D90F6B7C040356E13E3986298B5F78F50FB7
-AA073453B24D191F700286BB68AAAE6D77E1529AAAA00D86FE40526E96273134
-E283864A2170296053C539A9D5870507804E1E2865C1F737A7BE978579C9829E
-4B339205283CE90F6427F402AD9A67EADE1C6C34415FC36307D8A1A2A86A51D3
-98662F45140B3DB6E751F508634C04D9C36103A31288689D9A1CCE52D495FDA5
-57D1F221A883E6A86931370FF1C57833575EAA34BC2EB5039799BAB1D6B99860
-716466C2D0C37F3373021F966AF6EAA5DB28498FD290D0114241D47C520180CB
-454D1F3BEC6F63AD2BCDA34F7503A6265C8AC3115688FB738B09E180F55C8935
-5A821A9FA5A598353C7EEF9A2C5428275184B22D22E0F60C0A0C1D1C43AE5F03
-01A06C16AB8144034EC715D55C8882930890FF5C1FB93E4AAA49D99D2C147C27
-EB3220A36FA8F9A611CE125A9831E1BD8A1409BC845D9FF89CE952EAC659EF8E
-B2509CFA7CD4D5E918E1538E5F46D118F048C61334358D515339099932CE5476
-4556B808C39169EA6C55C5EDE0699EB9218B431353C15FAA6F7B4261C1333D9C
-213A5625F088728150E0A2C212DAD07FDA7694AED68F9FA3ED9BEF89C393A15C
-A7FBD8764F3B8165F1D5BEE6EA025DB8DE272269316208385F8BD4BFDA5D2D44
-27BF42005B10DFF2CA1C1701AECC58B5FD92E0D3EE02A8EA64170AC5F9A9A995
-5142860A85181C11CB1CB494AE4C7D41C3B93D94A7D5C8038529CB996463A2DD
-0036C9CA06029A725F7F84530D75D9E1072D4D4BCCBDC25A56E4B7681BC2BE97
-B7151637D8B786A2B7FDF83ABAAF6D7A9042CE0AE98F7C3781CC2F8901E947B9
-6B4D31E8D6D5E8F7F66D11B3BC666376C284EC24C9D1D083F76C56D0221FFF60
-AA585F1C4FDE0541624C7D92EFFEBA06DAD2BF6148B60BCC727F901724AD97E0
-61B6C512E9D49917F01C5AA51EE291BA98527840293EB33C1C4257740B261FFC
-C47F6BE71B96FA40713C2AE046AE59FB6653E874E1787E50F3CF3F625B87308D
-D7D777588AFBD43F9038A3EC5210029FB97BA9CB2E5038BA520005A88CD39230
-CC2FA8D7EF81D7B872925482A267B4E0A71AC8A6025EE6E12A9AFDCEBCA19848
-81D91D8393DED88F3D182E922AE2A122A36D71C766EAC46F4B4C4022093CE906
-E54F4678628C782D4DACD64B60E411CF9FF433F53312C44D5E96101DFCFF50A7
-5DDCCA88D2BC7B7B97874A2179E9EB0381D66D058BE17FECD3BC681BA215ABA1
-5D2F7777624B250F7A9E77E98C2F07DFE6869C459C2392CC420B43C6861BD4EF
-1EC66FF22F8337966F12D57691B4B85CE075FA01DB14F5613DDA0C47222A397B
-BCA1AEC22D912D45893081D52B8E639E82956EEAF9797953DEDB23C805F59669
-20B9EB86E852C109F5D74891C295A4FE101038EC8D7CED573FD57E8EBEF4ED07
-0BD79563058F8653B31CC2BB74C92AC1A71F9537A854D3848E5B49B1C0AAE1F2
-A93C4ABBC0B93523D9F15DF7FD8C17AE5C2620A5BBB996C90D0A556D73ECBF08
-1EB27E2E40002C3205A1255A8E343EB23944236E551BED8AEFAAB5AE6016D941
-47F28C20CEB75AD6AF5FE7C52CD35133B97F3DBE73F5B14393C47A79E7B97B72
-638761994F100F98117860AD354A8BF649FB4ED2F640D9972ED5F152BD242CC5
-B02E3F967012DF37335ED9CD7011A15DC9333C10CE70D23A90373D4EA3F4ACE5
-EEFD0D203E01E164FE2634052ED21D0F948033FCA14776DCC03B779611E4B6E9
-1882518BC17AA8EF1CBAE9775E4F3DE0D556CD5D4A726F74D2930C1F354F5726
-4C15C7AD6CD21FB9C73B029888C8905DF2A02603E0306AB7AD095FE32595B2F9
-E65F068F498CDE2290ACDEE596993FF175FB8620931A3C680419B9CB7F8FD2D8
-33755466D111342F692C47424F6E1F4059C474F7CA53DE4C8F6EE60210F1ADE9
-83F653DD92E2C15A595D19EE15F60AC88518D2E33F83E83C303CA49A5C39F295
-D7D147B0AC82510AC0DFFDD6F8390A175066AF343CFFE077DBB0DD27F9B41AEC
-19DD3115141F83FFE2575FC2676122F9ADC83E22555C164BB3A8122FCA8876DB
-CC17324EE79571B219B385E5454C121D84A767D398EA0C5F34CF5783AF410B76
-991CF963530BED15BD9149141587FEAF5770DCC8A32C9FC7518B524263D56FE2
-9FC4876E46194F9BCB692B3A7FFFEB22CFBEC8405A8286DEA6533EFA1DBEB4DE
-ADD8F906C7334F8CDD21060D35F24B66D53E3C4D2C37E9A6127C76F77F2A35EA
-7D7BBB05C8BA583DD9A269D4B38CEDA90AFAE002A19B4EE957E47D5B75C2B3C5
-1C3B43EBDB21D843F29DE2CA844E6E1C6218C453A82F70A6C8848C67F2E63A79
-A37EC8F5AC92611404E5268DC2F1A70C0ED29B4BD7FF380B7544C88247386091
-B97D303A0733B90BD95C13228B9AF937E995DE25B164F92ECAD1B62B9C8623A4
-340C904D5178CC9EBDB7971E6839758EAB6FAB286A3524FCFB9E4735FBA867ED
-FFE39A045F3841E352111EB5CF018CE47819A335D93508D544A070C12B251168
-6ABBE6D30D803DF8C414D751106EF919AA9CA0F59D9208A5085721D1A09931E9
-ED5A6CC3EAB277162366D2EDD758AB2F3175CFAE2312D2AE49E1E87614A9035E
-7D8ADE1137E73AC45E6F9506369E8E8645AB4DBBE8388DBD8AF05BF0B8E4DFB2
-332F353941875FF0566E52F8B65FBCAAFC7EA12342B90C8D927DF8FEE42F4556
-0883B5A3B4D6FE2BF837D27982CC1133B810916A7AE03EFD3F47D393CDB4386D
-F2FFB814E1A0E71BBCC475BA8BC06953FA5C8AF351C911935428ED22ABEF3822
-BBC0466F8151BFB286EF8275EFE5022D585805DD9838C5C286885BD5B17E6FE6
-9970133A14BC5CAC9AB898C57569EB8C39D367CFD48C7BD62F4D3D8EE1D306C0
-9D5BD8A615C1AAA83E8FEA614CA16688B07D6BE1DF5DC925E6C50D9EC45195EA
-4A41EB8E78E6F68AED4CC8E4733788DA2636CA7EA16B5EDE02A53172B7D2FF25
-2DEDBBC24F63F407ED3A2BE7DB640FE0D2B5580AB196B1076F266483B8C867AF
-2D6FAFB2A57DCEA9747723965BBFF9ADFBA707E5220277AE0937E0D3C3425402
-77D26CC49FB0E6B6301422543F0E771136153514EAA879E7F0B684E456BC80BC
-0DFE56DEF44A300335D0703BBC2FCE8D020E555E6236DFD5243F9546BAF6E281
-BB02AA4A7562A64F902547069E8F4431148F69B40EA3E5BFEFB5881319F7AAC5
-EC4E0D04E7F5BEA1C0AC4932A5F654E1F944636D1F0A3B15C5702DCB79A765DC
-EF6A50455566931C6FE5513D47CA245099A74DF9D29AE42FB802BF39752F7BE6
-BD64BE142E903C737091B799071AD3407D5AD671CC46D0B3D4FF116C73301F59
-B5AE136C368A2C7E38243846F12B91D1B0C15C1B10A90143231CDF75D63B04C6
-160F0CEA97D14C2E4D2CEC832D600437B3DB129E8196DC52965FF723B9E56881
-ECE08B6A933F02A7B755312E119B22530A22EB11E55111543027CF23A6620EE0
-45C29D0A1CEFBD8FF7C5D624B0655B73A98A39CCD624DCB0649B7328EFBB2606
-21A92EA19C1344CAF6F5A5D91D45AA9832FCCC5A41CF3B12DD35015FE337027A
-AABFE5E503DBB9D4ECF793FC16B81EE8A12CF6EE2136877E9C2D4FD9B87AAEFC
-97ED41FB430770C73FE1E61A47C73C9A99117DFF5DCE9A459F0286042ED80AE4
-C211364DBB9683475F6ED9F7793858CB5FF0A1F564E7AFE6C32351C12221FF5A
-C4DDF536F4EDD1F3DAEA3D24AF7FF4ED05D3731759FFFC0F7E0A0FDC3161EB03
-0829C04E5B450B055CD784DAC694A4AA4C0D49C29C1346628CA40CE09357C127
-3147D5EFD093623F22F1DBECC416C1BD43DEA0D128AFD923A3939203D77C5ECB
-49FEFB8D74EECE5FEE601D0E666EC8E4063A7BC2BD910C0C87314FC298428208
-16F61BF02FCC8193C050AEC765768A7640EBB3B873BFC4BDF0905CC7CAC4CA9C
-CBF035E2A2B469CE530BA8EB46B1005255BEAB3A63FDE2070F840A7802A9FFD9
-5FB0035BA885A201C9A3343499A503624BB1D0F0AFA77133E13CFA4C0830CC48
-D8BD18A5525590F4C56A9F29B6EA82DA0786DE33D1919DD855EC6B588C2339CD
-BC635FC1AB2ABB867B15E64840DCE1AA53373BE1722DF73AFF158125FCD6F66C
-8FF756B566126D8320252E2244A82710082B7142B9BEADA2ABB8EF5DD7EF7998
-9BA81DB5C9CCF2FE8C3271385D29E5D4EF28FEC6854626A9D0A128C16E16F63E
-E6D4E78C5745321549A0011C4B48A4DF9B463C5BCF1E1230D8D9B7E9905911A9
-0EE492CCAAD3CECB9C051BEA22C3839E3319274936057F666376A65F78060089
-BB721072E7F5DF2BC13134B6A3F95EFA914E404098FF8D2C69AAFBAE692AB402
-2C270E9F70B8265D39966B8F336C39C7A901E9E48058318C260AD2ECDF4316CE
-6CA9191C42CD6A16AAC55CAF82592CCF64C1D5B6CF58810503B24F203AEF0F1D
-48B91FA07509D782C441167205F96FACF1588CD956DC1320874DB1CB40FD961A
-676654E3DAECA127F9C5A80092AF6827E0E2F2B31CB11ADDB5E5724856DBA60A
-8ED4312EFC1591FB582AD4DC0390A5F8963C5B2B852082AE76BA29ACAFC624A0
-B268166077DBBF55392400E9C8160E25125CE6C4ADA29B83551623376FCD59A9
-89F1C64A1FA901CFAA20D063E103899CE96808BFEF9C3CF36BFEC63ACBEC2675
-93F27BF76686F9DA3E341D168D65A53F7D1220A13FF179912864E0C7F860F1A1
-AB3B1A045EAF52E4752FA0A6F1BAA8A2495983ED9D1EEDE32B19BECC7CCBD142
-2A19EC2A6E2CBAF5D0E525D6494D63A9C004B1D4A33C27848275C678F413674F
-E0D464565FC16624590E085E26243740701F3D87D6D4F3765216FDD6783D571B
-248D7F541869B4CC1785C29687880CA396B0C5B06EC910AF0568D802D0C81292
-9AFC214CF0BFE9A999965402E7BD676B552880C68197BB2E2FF5932155A907E0
-716E1B84C49B17C05C9A309BB6DDEE004808301EFBA46CCC5A571B50D254C940
-4DD4C43F17534450FCFDBB093EA68D2FC282B48F5C20B7F9EB2E099A3B4ACACB
-181C5F37C9C6276E3049FD7E2F8C67A07E507A25CF1BA751294D9F5EFF4CFDB5
-0B837215EC6CA4347342488502D6F1B8BE446A3AE862A03E0A36402A4EB45264
-4567E3EEC5DB5F69EAD5B7522411DE7AC8AA9522B079A962286315C150EE549C
-D5C1EEB3FC63B66929EEB6FDEF526BE7AAF06B4DF9F188705E0B2C851FD5AD29
-BA9F00BDCF9EF177DD7407BA10E5AB0C3A4F9F8DA48048A61C7CF873767870F6
-F66E669F6D2C36BC776D4B8EEF8581A9EE4E1DD3FB181D957111D0B74EB1362A
-C5398FC8DCCCC14A6C2D755864DC8B2DB199B7FFA06EE2FC613E1A7D2B5D74EE
-0EFF99E30FB56296D126A7D108387967167AFB5D2F5E0C0AFE7E26F464AACEC9
-7E6ECC700D6FE76A6D5D265E0A0BED62A1A0ABBFD7A3BA87CFC4F9162ED52266
-4DA164033110DDAD5A30B28DCF16E23C4C055B24FA9EAA2AEF953720C6039D1B
-85402575844BE848F03CBF445CBF9593F1C2FFEB8BFD1F8CB78163EDD46BF1CC
-704F60C6538BBDC15C2997BDC1939A52E63091F6F50F332538D19A917CEB60C2
-A8B575246A1F9A00418F7E4B9EA6F10DE15B91C2EF861CD35CAD1EF020E5497B
-F806253012D440B3D3D0E2FF114C5BE5E011D8B603E7D02800AD5C0D3D505155
-6F5F1292B1C92CE55DF5F6BC891772AE09CBFACB0F06551B3BE274ADCC737DE9
-01B9C192D9FB3BC3FC0127D0CA32A8EF4C99E0BEA94D9B9A9721F6AADDBBA2E1
-18E5282105B05AC38E82CC63560AEAAD3A6023A03078CA6F4D7BA8E59D92AF84
-777002D0007ED4CBE93F81EADF695DDF9C9763E4B98700B54A969D7226602024
-883B5909F6A0056034B86E55C59347465898AED8A4C2A5D6A13B93FEF4FB66EC
-201C79B5070116EA08E0B4246195E0E070442AC2C1F955A591E19474D21DEF78
-FF1DD6F8E90B1414C8A195BB6843098C33187A1FB662D6CA57A04CE2B97B495B
-4EF86DFEFC97BEC5D2CE01E20590AB41FD07ED81799A722462439A3985EC7B0B
-5E07C7687E2F76C93766EAD9B9F6274A23A4A655390CFE3870152FDCE07E39BF
-4748C4AC86F8519F86E3450593BAECCD4EC66F3D083CDE2CEE85A18E41EA57ED
-5511DC93E98B633F38F180F1A5E48F4DE97B62D0D91AFC5A14087F52FC166ACA
-220F8E85398E3EE5B0971C052BC9C0A2D9092A09712403B8F4DBD3E999E3C036
-13302D5CBB0FCF3790196D5E38C87315AE202183C49A21741D1E2EA3CDECE786
-2AAA84AFA22F071FC98484B06E390DD0F5750A03091A3E9EE7556481EEFD734F
-74D2ADD097F8D95F46C5C386EA0F842E393A5FA11BE51601ACB4832BB89EC037
-683F13C68618CB6F5E9363C317786FAF58B0F46F5F364E155D41A4561C193BF1
-F808A6C7152FE62A702FC13202F73F747C75C890DEC65A2459A698796E3A9CD5
-6AED0A64756FB43FB5321E3693DB6CCBD6720CC9815FBD9BD742BEE29E72F820
-E2ED969D138CB051EC3FCA2B82E22DD21B648BDC83FC2301C25D6AA7DBEDF65F
-9E2699546274DFDB81451874B04ED3BADEFA126373955D64DF0B15F10C67EFF7
-30643BA1C7AA8089739BA8C779FC707BE1F681ABEC3C34F2A6284C264903255D
-0A63D5EB37B977E9B00F3003CCB358AD48507587CE02341A0A226E30B35E3DE7
-3A3B0B396F3F1C2EBF42CBC55A195B47452791ACA9B9802FE687F3B994348A04
-90FC420D56AE7616C0EF0542F340380D492BB4B900C40F91AB57913A58CBDCB8
-480B6B525B4EC2D232DD997EEBB3600B73A39A2DD2A713DE7E69683B1766E7B6
-AD65B4EFD88C0D159A80B9BCFC033E4466CFC36CFB9F34014B0CF902F5F9A7D1
-566547928426ADBC9097A5F7842DBB10059678532856521034ADE873B55C3E06
-EC8C1D78334313CE2DFB1DE71FEEAA17710B4A9B3773D3225379756B979149FD
-135D37B1022358386FBFCDEBD2B26D91C9EF0CCCA1B27ADA83C5F0CC48C04BBF
-73BCC497ED5DB855296314CF8AA79DCD8AF08F1493F65426D72AA86D7DAF2F47
-551B35A525DDB19AABEED9C99CC89C2F0C6EAE7C60DFCE56C4F69C4CB5FCE33D
-828E3B9F3CDC1ABA6CC6476C1156CFEFEBFB89815B800C0B06BF64825BE72678
-8C0AF76ED6F8E76D26A98CF7AE75AB109ACDE596FCF8F4A502911CD757354DD9
-57BB7795063FBC1C1AF4E1B567061B8A975316C0159038E34BCACA5BFF8EEB06
-5134B38146B3C5E01DA5E097B8F5DC9FCF7014B4A811AEF0EAE2E2977F6F50CE
-E28156444214ED37532E40C23CD2F4A55AC0AD2943703B152CD3B22ADAA5FCA4
-D02AF7D8E2DBCE39A91C0FD0D0F540CF97A76F3FEF75E36DD33033C1A2331475
-3F2A8C610F2CD04070339637915738523110D80F6FA7AB8722DD6A06C975E6D8
-D5AA5DAF47C1B37D7B0B38A5734F4BBF05A68C5999A6E614786581B6AD202BEA
-69AEC361C1BF58A5900C1E3D00C4BFC5596CA9A8522FEA0DDEC0B7EFC34F8DCF
-3EDB2E29624A7FA8FA1A3474C7D919E1558AE84F3BBAB40AC30E5D405E523E70
-7FF71732C91D3C25126205F7E3A0E56BD61CEBC6F1CEBD520B1B93E0BFA17517
-7016303B83D18ECA1EFEAB621A38848F5408A41A0DC52319DEFF5931A506AF2D
-23A017AC71738EA9CFD6439419CB2F094548586C22591429C24F179417386D6B
-7422E76397F9BCADEAA0323ECBA854C07A158077EDD502B03C1CC1D29D1EE80D
-91D58ED070BDA692ADAA98C08661F1F848836F856C78F9A7497E063FD7904D71
-64AE15B1BC14EED1A7E6717246CF2FD7235D2770753516FD9AD1DFFD399319BC
-393209D3253310F10EDCA47E7BB81231EBECE4B3B64245F7894C4888CCFF45E1
-53F6DF629C8A33D73EF26EB4A7B2C94560F8B9F3EDF5B6E8FC3032C557539FC9
-14B2CD642B4459D613C65D97567F33C5BC96052BF155A25D0065E9BD1C3A6492
-8F0194EF29C0182D2A2E2A2591D792BE071B4B37587CE75F747ED760690D1CEF
-12C1443F997CB68FB4921F929E88F19CAF7991870C124AFF94A5D2C768433D92
-7E053F8F96D142AAC303D1D114B6C52E2C6ACB257E47DF6863827915A854BCF5
-98FAF350F71D9BDF2F70CFF4378BFF0B13113C591626F01F8486B7FE64B88E7B
-B7A345CBFD09CC9E048245D10714516508CC6AAF66A613E8563D2D8D5430FB69
-FE9F89E000847CD5CCCC73013953C50AA5FAF4068CFE756EB490ABBCAD7B5B22
-681476D1026CEEB22C9702209D92D7359E96239195769E009793E7B78E47E07A
-9C378E37183C6C2BD11866717CFC0778E4ECF8E6E7C0E0950340E052AE8F4116
-22561FCB48DFE8D56AFE3A922DBBF60E5CBA7005D748AE1BA7863BA1AB290236
-25DEC1881C106CF4B457E9F69BBC0C6A2092FDD566B742C167987998A9041F86
-BB6D8A9ADC7947D4BA39C1600358609C90D1AE51A5E3BE9AB15A208A9817EDF8
-90175FC2C67139BBF9AF22010160FBD7CB032A1E078C53A64F948BCD855F6BCB
-55B0DD46C6FE7A2F09CB814CEA71705F600F2B306EA9A0C06AF8E67413DFB694
-4749731403B81292D9FDB2F7F5C749C1623F854B2FBFB5A15ED4D3620592E9E2
-FA8FD26DF4D792893441CE3EA2987966AEB4AD527F395DC5128E494A5E0CD1D4
-9F9F01BE1BB170A75CD9D4557D055C485BE54C3447CCCFC90C5745150EEBD88C
-8F3BE4E795AC9F4EE141C31CEC15D2A91735AFA894D0706178102537C2485D76
-E3B1D929E45C742411D004E77D2D8D2BA2632EEAF4C356633DA4CA20ADDBE1B1
-5B64EBA05CD5F8566CB10268C4F534B775415F8FE9A2FBFAF6AB880B0892C3DC
-849522CBA30C08FBB753917347CE8BAE7B99EDBD3FF2895F0954DF907E64B531
-7B85E1DB2F4040E9088BAF2B2FB51CD757564165E8C660EDE3C88279EE790172
-68B73DE643527E75333759B02D7BF8621881B3CAFA2CDA69BF9F3102C983A252
-B16A35294703F2DF89A757B72F86E107CB90BDAC614F0A0C7612174445D87B72
-6F396D7BC86514691C3F8B04F9F2A61B44DE1E80CDB15E7F49BCA245501E3953
-205AAF574A8FAF5AE129614646706C9A11FD4531D45111A87138240CE39C7F6F
-48FFA2EC3EF86B3D7152DA2C6093FF9000EA9CC9E571E13F65E1E39C7AC62B40
-25631747274A7CE9A68B9A47CED36586DB1D08A931161F011B5544781D32D90B
-685F0313DCE4AAAECD2573587A412F0E7326DE5B5F83858809F956AC82477CCA
-4FA06852CC31ABACDDFCDAD1D9B85647A713FF5ED8642B725664A2C369C33EA8
-B6F212D0FAA14BB54D881376CA91439197AC47153BBEC903A4D5D0F5D6F871E9
-B020FDCEBFCC521CC8E2187BE479CE9914F9D7D4519E9474D14EEE6699B03114
-06EED1B8403F02E7963A072366FA61CC46452D1619655A89710182107DE93375
-30C3EB937E9F0AE11EBA12F04386FCF004E72BA6A2B85B30B7AF3D015559ACE8
-130C3B90FDD4294EF0D78250B9738A7C99B117309754B5646BFE82E5B811DBF0
-101AE44042BBF22A0821235022416C6EF8E21BC9A2563E554F63CD3B4130D380
-298A29C3AFA8AE9CE1C78C77D6D493FAB5CAFD2D9547A72D13DCFE650373C46F
-A28017FF48FEF310AA54120C199C6616B1DE3D45DC374F2C7B8FCFD11AFC7242
-CA94DEAC7454310AC71DD00933F5520F7B7776224AED667957C4131DACEBE83A
-97D3C036775FEAB8E4C15686627D9CEAA50B891BE937F995D1BB72D2D4479C5E
-BB29C15909565C86D6EB623FD067627674B9D636AF0E6AA2E3AF08185C91A87C
-1DAAE7B207B75FC41232A1170A765AE4CE21208B49287C7753D652DDCA751C6E
-68453CC16AA4AE7CC3808A6DCBAE191793B0047787419565757447E98B6461B4
-E6C2C0016BAA0BC279C6ABD2EBB32702E669A5F4E2B5F7B4EE5F53D83524E1DB
-75F4532484BB396364F2F4514F91102A493315D70E2ADD132FB31906E8A23BD8
-E3121DC3AF7A196D2054698AAE898F65B6D0D84F65EA918CE1C6FC4B1E6CC23A
-CC2FAE0FD96D36EDC5C50A0D6D7C4A1E36EB1399DB0E29D2D4964C058CAADCB7
-C19C5D25981FFE4BC66EFB316487608625D0DC726022772A661C0E69A5B6741A
-CB3D37ED0852C328148527CEA461A92FB4698097E72244964AA9C69DDA2BF798
-3D125CB8B896EAC1AB0F16BA3A50DD34BB8B3529E9A7F37793A50E012E35BFE4
-7E8A70B289655BA976BBC5EEC0165653D00116A4FCACB1F49C427B0B6C7BFDFF
-FF4AAEA93AB473305577D134C3240D970E17D42F407420461FE5125C3A03FD8E
-04351E0314203320E51EAC86A74A3CC821DF3C70E3A6C678FC04133C5FCA2145
-A5153EE6548A340FB382A6ECEA394498EA1A041987F27817B36022F600E9CA57
-E338C98521C2DD649D05A1130B609FBC342EEFEC00D990DA97E8348E84623859
-0D01DFD10457A38102BA8F93C97640A4A143EA1ABF7A141EAA0D7535632158C2
-5F0D0FBAB8683C09EAFC8AE79DB8AF83FB7766EE83BDCD08917600D41B4BFB1B
-B7A993B6809FBD7273A89D47086504E318FC677C635166D9F5DAEDA7207428BF
-26781C40FA494292225F8FFAD4B29DEDFF234D66B5F1A945C31A8559AEE0F072
-6580BD40D977FFEC00A8EA73886A58D7EBDBCD099D5304735B08F7ECBED90270
-924DFCFCE0AA43130ED047F1161C564E16D6BEDD6B85B131BBA6C0BD2D2AB7A6
-2F0A31DE15C08015B82763A6E83E2682251C713F2CEC26DB1217A0606A4EFCFA
-5C3DFF669F1E2412F14A23A8E132D7E183F0FEB3E872F784903A41176E4228E5
-B4747A475C7A05BCB99DF8DD0974BE2BD374FAC3C8FF1DBCA5D6F5EAF1943510
-6231E304573E7CAFDDFE2F2A5DFB5F7C441AE694F13C3F90F54A187E07000686
-E8554666AA962B433DC096AD033E73BCDC78788E352835A88CD054DC6E1F6E89
-95D1430EF5D91A510BD891FDCE152BE0DC3E331688CBBEA9459BEA0D12AC8AFE
-3554737BBD944E0FE6973109B2777EA764F30B21625D4ACF425D3E463A46C670
-77534C69D0C456044E1AF87B7819DF303D13A8B88260C7D72BCBB4273D123A1A
-209EB37512843398BDD13B04E649ADD0E0714DD33429D228984140630C8D982E
-42D4E0EFAF96751775F9936C66836AE953DD2266A3477030B65707CE8429C662
-D6E4A9865B4B8C3716C4F6DC9B00D92F230CD90AF3586B47AFCAA4DCD3F5E76F
-22F99D84EFA2F474D4C0AF342EE09992950988E269D3615915A3ACC187E568EA
-EDEED2521392544E774D3C91AC688CBF7CAB911C6375F94166B8A8F432778604
-63944E7C3BCFE056A8631B89D2F21EEC2884A1D9974AD6C511331FD45FE7F51D
-270C0362D808795F2F6C9B2661E1407DDFB94AA0568F0A53459C7CD395D0E240
-93744CFA9F4DB3800483459E08AA1AB49C569196B58F3C6B0089555C497ED7F6
-9CAABDC938BBF909E8AC4900C1F700D4C0ADCC1437143D8CD4486850C4A98F70
-3ED44B1B180DC8BA328618EE7B1BFA006D0C6F1BB121EA39CA4B1C961F3F83BC
-174FE36B60A0F4DFD84E26CD9B17DB938D8D35312393CC3336F2393A61E612F4
-BCFA3077FF17C7ED3B01194A6527184FA0C38A8CA0EE84590A2CFA74267997F3
-35BE395D2BEDC4691B1F68BB9808EB0A8FA62E7CACE9289C9345320F475FE4DA
-329DAA8D136E076411738169C37E9D6040DA5C1105A93FCDE630F8797A7BAFDD
-15182536D44A40A27A1A17E932B247892517DDB143F1A22E05D23B09D6787FC6
-C7B2635083E1D333A3E3D5D1FF875BC7160135A9BC4DDA6D13A27F647C825724
-6CB21F7179E3F643A508822C1528A06BE1CF7A2F25D5E5D18EB6F73555681784
-9E901B128614560B8800FA6FA010DC0EA0CA726DB85854138EC839D520D122EE
-5D990B29FEC8ECD9C31D6A740F7491AE02B51B1872A7DB7EDB851BACD2300D0A
-01C97B022888A5EE25AF1FD9CDDB20A2E567E38C57B1D5EA2C27E2321264E885
-01DBE50E5A3C4590E992E61EB9008611F110C9396F3BCFCE936AD3E11D4918FC
-B8DCA8F34BC936DDDF6EC7B3B449944B29ED6A3C6C3F9292E48F9EC5CF0F70C5
-60D8D671C3DBF64224108F741EDE19A60BE29D64871F726BF7ED1E02089CE2BB
-4DC8F4D23E0CF34C3B7F6C90C4043DF2D8B85A13B0CAABBDD01C81EEB01041F4
-4980B5187BC8C1B08DF9C8C7AB70A337AA568B0F6714F74E4DDD88295CB99A8F
-9D4CD756F1034D00C46C8DAA25DFDF3018EA67DD0E6E5374EE0D0586ACF095D1
-83B44831C0CFC5E7130F44D938B9EAB2B740216133854C417E05CEA62A49F2C2
-5FCF3455D9AA96945C01D73C814CE1F7CB9A54544F144B4883F4D8CB00AC5450
-6506F0F59DB5D9C144500012D4F41E8D1B8197581FF138CFC8CBA235FBEBE153
-1B6850C7D3C8CA2B79BE7BDE1EA748BE8ADF3FB09D187341199C84FC0CBF9453
-C238BCD1C4F82A8688A575F0B15F3F7D82565BA62A5F8F0F6363392FC3262A37
-8750900A22A9116C01BF4533DA211174072F34C21EEA44BF35B3D3C3BC8D6AE9
-BEA520E5EAC71304ED8CEDEFF92F93E7FC553A9168D41BCD5FD977A6CAEF584A
-DCC74C50CB37968AE9C0C5BBAD0BBDFA9DA2B421DC89DC332C4C6C0426DB97E5
-81B170477DC4B6F62C6A4960030882C28F0B3FF50A08CF18E359D6E95BA2BD8A
-8552F0338DF12E4DA843E3EAFC4444EC39269D61860704D722E422BA502C1633
-A23D5BAF15CD44CC22F67D2FBD8D855931558641255F1F2CB8DA3ADDD771CF6F
-2D6C503C9C3BE2F593E475A16B0DB7570D142DD81549F099773BA5267BBCEB7C
-C4CF66E68FE221970E61593EAE06013A9C790E542C820945D764D01C7F4D9EF9
-245A07C9304B784201D7D06566C91363B45CB5D6577F385456697575572276E6
-B310AFF7485325E5056F7123C839AF630CCC9A410FBB33C0636DA87C9A0B95C4
-BF0E8FE113F965BB23EB631F47AFAE6418D00C6F809B49E2DEB14828BFD11B7D
-06CFA669102A6EF9D864A6230FD0AFE54A93A25EA70A53CC3CFE060E40A281E9
-07FD9CE479DDF79C5034C592B80010A289834350AF08EA9C1C6464EDB2C07695
-5D1327C7FA939CDCDE954662772C3A6B96FB1ECF5B2D63FE4266A67D4A806FAA
-237B3ED16C85321764EB8F35523F79C016C50033784C3AAC9E5908EEDF249078
-8DADEB4EA95E674B598EA6A30DF9AB4740C4FF4439C023452B444585E6CA5707
-44A2CE2B3DEDBA44257870D42C8A02199C02569B71E8984041AEA872770760C6
-AA6297E946516A3FEE3EB0F2BD88226A11FA23A6D5A61F4AAD0F8E5CDD1B7F7D
-169A04C8E460E0FEBC845D87AB60F69A85F8664C9E3373F3909A72B3967C6E7D
-9E261C02FE726DA6D1D8D34D042B0024C63C532DC756763C4312E9F7759992AB
-26861822BBB6BE290F1C377FAB01D8902FFC8F48288BA6DD0AE875ED602CE204
-A6B28360BAF0A5FF2BEA0875C8735270DCB7C22491FA9D1D8977E8973A4DE0D5
-A57A1D80E712B347A3E28FEAFF9C94BEE26A75C900504F958804263CFF2D6BF9
-66C661889332BED6D47D1B846A69E48AF64C32381A282C9E3FC6E116C2FCC8A9
-67D3E29EACE37661BA2BA4894BD25BCF2C5D241D8D949928151B006593CB212E
-106E738462CA9F739D7A8EC6FB6F80C4E5CC436F0E6AA2823E3B83C58CB4B785
-AED595A4B0F32FD91835A8F039EC8D7CEDD667E0F5F15E9572BE2CC98D8EF6DE
-21861EC36D3B67B5846F77E4C388130AD5A9EAF4B492FC29C669A6A19E3A5444
-64B3E7D88C8B5F776AF63F6F10CD7A4614B2B7EE47157E6AA4B8F9D65B10B4B1
-8813D4F973080740F233737AB7F02D5CA201015CBFBABBD54759726D51E8CCD7
-E3CBF2507AC8453DF0EA66191AF825FA2D3132C8A3B7CDA71BD0366214C0F30C
-ABF5C6D70A3DDF63A6BD2E9DAB500B4F45A405B74DB1C83E20C49A2041258C47
-5AED28A9A49B78C09A26F0FE35C1A335C499DF22D581142015C3B1E27D35AC3D
-541EE3895566BB73D53845FF46B2E15C4A56A136E20B0218A0987E8895551B9F
-4EE133028547F1C2EF1BF327269854B54682345726C3BA64F900722E23E1B32E
-84C56A843A1A2CB2B8CC1B9644A1DED4A0DD1AABE5B5FBF19A30668B0C37316C
-E15373017428A860DE9AB9F07C89FC156FF537B7D768D22C7B1E5744CAECCD85
-FF5AAAF42104A71FBDC2CB06DE8500D4193CD9DA4CE0D54DC0113A64740CADE7
-F504414F21869B11F1E26B035FC36CE0DF91EB27378647EC234F989C87EBF296
-156471CD28F3188FA329E0923DC7AB3BDA4F786509B2B6E7F52F77EB95A3BB58
-CB41A58AAA15161710C72000839CED32FF315E86D952BF10E4EE28B6018A6D98
-EC796CA11E15826E961D0F425B1EBD9A21BD23FCE74E74C2D67717464CE9891C
-285543C3D10E627DAE2D768417B081EBCC569B7ABF80FC581E2A2E5A86644711
-B23A61B5AE9C65B846B190A7856AF3D6C8C97A96B6B7B9DEC43E9B6A26AF6240
-579B9C80AEB704CAF7464F451ECCAF59A1863D0A66257649EF103D46F622E382
-A4C705292E23FAA9D3E23B11E90726406DB6215B55B74A71F7F66D54977AEF48
-D39911E099B51ACFCD72A9042ED5A6A5688B3ACE3B6D8775CF238579EEA7DF90
-198CA615034333503D4D5938CD789F063384BCDD5E52AFB69CBB3EDFEF8942AA
-6D3AB76D2285A21B183FF2ED76DBD17E63BA58223183D9D672BA4C5A38DEBED1
-F710BD9FA9B75ECEFF35FDAF9A81C84336562ADF81D7A6E2DF956FB531BA83C9
-4C9BE454947D6CB9CBDDABF2119A1EB830533B33EEE3389276096503FEAC58F6
-64E11E68BE3B895B0B2EB353A8218938A9A8CA6D36270ECC0C8290D35B3AC0E5
-3401652E8AEAFD415E72A8B4D8F3C13882F78918AB86F66A305804775D31F053
-E947D0C97CF3C48550B2074BEACA87B9532A83C43B44DA8815BF1E7694AF202C
-60E66AD2B22D13A21C05F441E0D5E11024568743F5664FDE68856BA289C9F6CC
-EA29D561996F7FD4C8657BFAF84D2B51D9105A6B56DB485B74317C8965859786
-5B9483DD4F13DE44A8A5793123046206DCD6B4B8D7A366F9899CF8882B21EDAA
-3041428849998362A954CAE8793A846B24F186D117E36844322EF158EEF4D1EA
-7C594BD937757D94D165A51358DAE698DB5B0F3F5267DE03190FDD51C2B684C0
-E38799610E553E5A9B4FA27E3BD3726597634F456D0C61B51DBFADE1B7179DCA
-4F8ADD2A8E7F2A0C12F7324EF1CD7DA47F3D5913029662FA9C6077F3C9902897
-D363984CFAF467296F72C3DDB15E6A8CC9B60C3DB7F15062D8F32ED1677C52F4
-7BD71768C5B14E9E8254B77D80203D61C7A46B18279866D219A24F1B23358E6D
-11D2B7160BFA3393EB9D1794304A8C7D094D234F1424DE481F1F5DA9C1EC4FE7
-31D4229941A14B401F512EAA7C0C74A42E47741B03D1A78706470834ED36923B
-C0A52AE6D31A08CCCE1AC02E994FCBB9218932F6CE8B0BF79EE393BDB4988244
-83C384FB3333E09DF0BBA34656623242AFE31B39F827BE534333A93C1D3CAD95
-CB3D9E1587FB694FCE9472358AB2A99A820DEB422A86A715B15CAFFFA1BAEE74
-475E99BF177ADED5E1A12ED5E3C662E2D3F26EFBE780DD045978D5965E89FFDF
-0A5948E692CF7DE29E5B1A1D33A030D55E1D7BD6A0A717EEEE4D3EAD512DBF4A
-3A8D6918D3396D326257D17386DB2BA6B55D5E8DE1D070A8D3E844D39E35BBF8
-2EDE74110186F43A09F751C485289D9BA0B7949E287BBE648DF618CE9A028358
-DD8E5F2758AC8358DBBDA07ECDB00B77407F5D09D87AFBCF20F02AC950C52FC7
-8DE7844C4C4AC8CF70EDA68E9BD55C00013DEDCA5C814D36B53FAC4064B8796A
-EBFFA24DA2DDDA25D3738192BA50F2F12A68596A9D3AFF33CE3C040DC62FDDB7
-B8CBB3A5E878E6E9A0C52F970946D81E5C873186109D4777ADAC59F855A483B7
-D796DCF4FE6DD4D01CA9A3466BA843D4EC7D665B8719F669429CF0BDB4FAB6C1
-8F34DBEF53429D1A006BE23F1DE1BBAE68E53BBE40B4D979B6C0A09134C57853
-A385B9AB8D220BACCC1D8726417B838510BC1C5BCDBC81E62A18A54417DDBBB1
-80725F5499CA08CB1A01AECDEC7ABB36CC518A35435425CF3B4AA1BE49ADBC1B
-17278DC8E698CD55316B57C1FEA461ADFED533808F009FE161813F5783FC76DC
-6E3590BCD34C91DCE8B35F73BC42C44E5C477225FE02DBDA4F42F4A482E0E6CF
-19EBF5F31E2D425E80C4FDC8FC06B57DD9AA060682A242F159C3B7EBC50A1832
-60DB7B5602085F119E471C805A89772FD6B97E9AF9749E2EF7DDF69D39E71153
-46BC2E75654757D539D23460E4AD8F2039080D61B412B37A6042C090A8939E33
-23A2CC49B48B72E6C59AE422EA56911399115816EF6EA7E4C0F75CAAC5AE9180
-AE852BEC0BA3D2D6CDE9DCB32E67E682AE5C115CAE3FCAB4570B6902B6B25E89
-59F4294FD6F4E8512EBFE752152DF26F9503A0754BC8ED48EE5F9FC492701314
-F9D38D2F5931DCBE8BD011BAC4EB016E116AFF7225BB06F9D7CCC047FE5B8995
-06CE92D0E1777D667C4145B015D726CE8AF0C560124DF89C95F58D6C6BF2D263
-7057FE497302D6DCC60064812AF0250DF9754B16B0840929349814DC489EDD37
-62475072F593EEB69745E85CC13A74F5B9D676440B64B757B2DB67B105054373
-F8F77BA303A993787AE579F7C16120818C4621FB69A359258FE74A93880B3ECC
-65C6C091B4E3C4781039C7B4E5C60DF19954B5E16BA170111535184DF978A32F
-C259E863DD2531BA6F7583C856842289DB822F21249C54669773215ABEC5ACB4
-B75B09618E9816398DF9F6441B06AA3CAAD7471371710648585E03830E4CFF79
-C2E132E9E3443E3181296AC32463EE77353B63E56202198ACAF00F6C3B18594D
-ED45B5177BA8444BA0BA960186411576299AD0390A96038F9272533228E60579
-39DB6A07F76CBBDEB0771B212E6C115220DAD4F40A4D72580E7F4F35D7BACBAE
-C85AAE2B5C19337E826B304B0F2275982B9E53E9197C104FDD31AE6CAE916076
-9D883898467FEDDB51926CAE802AAE1B0B854574DD225193C8B8175D5FC3698D
-F91518F7E295C63A4E0CAF526BC5133528D08ACEAA51CF2EAA12F19BE72028B7
-BC0B9012A6399ECBE07D6C0A8A63F4FB16171E8144596F7E72E9212979FBFD51
-CB22E314BD0945C253AEB226F48C14B09D1E16994F4F998C6ED0FADEAF6FBCAB
-928A9DFD791B0798336B167AE7DFAA142E7F66615DBFA5C60C9D648DF5C7CE0A
-5EEEF5328AC3CF5DC8069F3FCF387B0AE5998EC6FDF6473735F09A01C134305D
-A849A5CADAE3A5D75268336262DAA145FCDB8367C162F34FB2129D5B891D2834
-19D225B9AFA19B886A24E63347C8C3F6D18555A491CFE87FD375FAE4CCBD05F2
-068306B114F719C5F815325C816E544BB18B23EA3696AC428FA93EC820A0962F
-4F87BBB1451B061EFFA4CCD006F824A2EAF335FBDBCE70364CB2B1B6A6536893
-B0898C620114F8EF0F1A08DC61EA905B21FC040BC94A876233382BD4A2240F58
-937DC70061DB2EB774DCBB5D8EB6AB0040C653DAC66BDAF02B475A325B15C68B
-D84BAEC97D714EDC21B11DFA7DA5F61E9F8F3BAC60C831392BB2E06ED6D91A39
-E117056185DC97511DF6CB8A98E7082C61B8CAAE36F27C6A610181677A1F9D72
-33EF80D91BD0F2B243BD9B959250758E5EE8410E9BDFCC6A40A5D1BAA134531C
-8C38CA61BA2F5BA9288F548690B54D6C3005F3510F008E56A5121EDD51FC3D7E
-5851184867F203F69CFFD9F1652553DDE002AEA1B94F9671C2B4EB05105644DA
-F94991928BBF13A68801BAE4D3BC27C289662E40799D5398416DC5FC110D5890
-BC3ED389E572F9070767E5DBD1B95EC0019C218CA73CD21BA7EE9460B7DA19FD
-AC097C35D3ED5C31A263C03B748CBF5799DE41EF262CAA6D796E3E4BCA7D5BD1
-5C80F9C7BDD9C2D6480A00667B3CF26BC2CBEE260B3D3DC0BE0F9A0401354325
-854CE9D8F5B990D83CE7E7C1920924F6EFFA5361F9AEBE2F666048F67ECE58DE
-6271401C9A585CA2EB43A70DD58768B76457A27BBEB4072994860266CF32A8A0
-0C4F99FAE668972FDB8A6CC60DE13DDA3D597255E4EE1E3ED43A91754F6B8513
-11202A7096A93C7846C2BE0BC9ACC628659FAE7B46502144CEC96BB97BF461F6
-A6835D550BD5220C8FF579F52BA42B32C76D624F9F2E7347C48622202B3BCA1D
-366509F881A31D9C3FAF365F1C20975D5677A2ED441E169144F8D0B6925962A5
-AD92CE8338B8145122D55B938684A0056E8E9B09E20D8FD4C26CB0A8DFDE84A6
-A7778ACC28EF7DBA6FC1CDBC5705800A29FBF238AEC1763E0F9B02339FA6A8E4
-11D8C3E9DC97CDA9312D91A3A64E72ED65ACC8B9460E77688BE8C5315E31010D
-1A2595442F58965BCC7AB3E245D7E82C869FF631D6B5154A178DE4C5C7CD0DEF
-B5FE7A13BE0EDDB3478F24E9E415E0999936DAF4001200CB69010A27046EA11B
-2C677F2F838885BBDE9F370E6D981EBE3814A6E26DF7398E71307C267E91CA52
-FC7E4039D45A538B225E1B285688E4CAA243E1A05ACAC6BD29DA173D99831049
-70C9EE5EDD31D644683A5458E9167AC38BA9EFD44923463298A683D449936D01
-DE6366E1369E9D1D37A68CAA3F379A012895980857A510A624C669CC103B71CF
-E507EA75854F0ACAF25FF1B0AC5CAF338D21FFF0F7941D9FEA340A2AA9659F58
-3EBBBBF52469CECD979F4BD3FAA32763EC2304810EC2341F52678AD8F267385A
-1FB9DAB00F1ADE83E37741CCACED5214460FD8A487F9B9C77A401095434AB8BF
-2243497A1732510CBD90675E073BAE7CB2C4FA32028EAC040AD5B5B3FE4675D7
-D8CD9173A7486EDBF9FF59B02F42982CEA6E2E54CA12175E3065808CA54124F4
-33C0B1047BE03EF8550BB6D63FD312B9DB10713A6F4EDD439452083586A22172
-5D251910014D503B571862FC2B9A9F6818E5FC4D2BDC61B0BF3A65A8DB578C99
-A34263CC197B3E08AEFFC1A50AEF145004AFE122098FD5B31D98C1301FA9FF3C
-7E5BA9160E88980715743756E34F840C6950023A6C9D6114348AEC5F4236D34A
-14E80D884B0AC4D368AABBD7E4955F2818C157ACE66AAC950919ECDF8038A985
-0372A6DAC4548E8E17BB5CB06C20F08A9DA85132C20B91F5CF0D902190C25A44
-F045FFF129E607D49FD4B707D437E97A1B1303954636B4C541FFB0F8354C946B
-E258179ADD8096A1AD49C11C81AFBB5564252BE349486A7AC8A26C20F7B5D404
-18A08B4412E0AC1FF8A18B687722041F3AC5A1F1E7567299CF906AB0E37143CB
-A3703FCAAE846FA55B7FF43FF7EFE2AB34F3FDD9A66360D669459A54D96A23DA
-B5BC73CE7DD9B433773D9F4F0FBB55BFDD6BC18EB47CFBDF3503E7C60CC785EC
-F6D032CA9A9E8F9DFE7156F76ABFE4F2436BBD3F0C942C65D1E182F04FAFF45F
-C6CDE75ADC8E0292D7EDE48FC45E9A6E35D5C45B87E4FF82BCFBCF95025C2976
-7901B6740EF3ABA5AA29111252003BCE13CD6A3E6C834FA0E4C01BD076E47962
-EF303BDE9DD09D6907D836CF9199E7C47416D24D24093317F5DCF5C833956031
-CDA4943283F99C0B308D5857856EF286F8E020F7EA923F17101A582806939AF9
-EC02BD1B9CDAB8373938B9BC961389D769642ADAADB26B39FE2DF0FB8E812655
-040F93A9C9C44BABB746F0CB51D8B2018B1F5620D60F624347123ED831268F35
-3F14CD8E693F35CA35F84478B68BAF34A519167202596E9A087583E56DC53AB3
-17B8C3B396453156E007DAA86D441AC8E874A987855928CF78D990B027C3F4AC
-35B7CEBE10A5225B84AF0AF2FB814384986D5B50D624B7C2CEAAF3DB1C300AFD
-5D492291111EE99F371CBD35B6B301F6F141B12148B9B48F2981261CEA0781F8
-2C6EAF4F78E03B8EF8FACDF79C2EF33FAFA7B3695D0F259005B896FAC44D34D6
-4C590D55E611C34A22E1F61D1A58251C0A962115D58E0695DF6A98F505DF44FA
-7D7C21170D98D3A6652F8A8893CD739FA8A9DD73E6E26A3A3B6D7605C9F7AF75
-FC8A71DCD925BAC4BB99203BF81D2617C2E0C6E4BC21721299013D3B9644120B
-4ECB846F77B3AF897F92813102E8004F14443BCBE6B81F15A9423994B749EF4B
-C3737CE7791B0577BBC54D29EB458A841E6DF73FC36DBC2D6EF65DF0E53544DA
-1CD9FABE29F7172EA3245EAA958D05ACD9B91E5BA30414DB41ADDF8317F5B7F5
-1FF06DE55AE1573A5D0FA138DE4D2F078DD7D7926C6E98374871586E6ED9F5FE
-BE15D9433127FF0CBCE30846CE71E4D84704AF00F19FA0D4D54DC1CE2E4991FA
-8ABE228220D150AF3211E672064B4E59FCAC1B48CF99306519C7C1053E422CE5
-2EFC96E981C5227BEA54F9651B59B9F3026AC34080355FD05CCF22871E0FB75A
-BA05BBE538541922695F1D8FCE7D6D0D92FA5A11412203296890C83FC49EE6BE
-FEFE63B3B3E868F92AD389ED479C04D76192DE6DC0D13DB91DEA4651C1936BC7
-49181A960FB872A8C68AC09A385A0EEB9C9C85654A208EB86B2173453292CA9E
-634EA2944F64F96C259369AAA0B9EB07535352C25DDEA8E92D030BFC41D66670
-88F861BA06264496B2BFCB8DE46084CCFC4F3D3BB76E402E97980B08A9690DC3
-8FBDD6721961810D32E8626D528C704F7F1818FDEE1F91A4AB16A6B817A33CC6
-1AB08A2A36D424929872FDD701E83163DAF18B14B101A809E737C4137834A764
-607B4F416980EC7EBC542BD62DFB6CFD355EE815A64D14299B9656ADF85000C3
-AB5CF404FA4D3C771AD37E1CDBD3DE70687096790950C0E3EDF6A57FC60989C0
-A421A529E6C3AEB98A225704C97F5AFCFBB755C6C9FA193F5E89EE8D21A6E043
-29D48B6D90798E4B1B82AA0ABD368099962C339FB640CEC9CC1192C751EAD1AC
-E1E450E56D503D7D091AEAF955B537116ADB479C90F16BD815AD592031DC85DF
-06E0EB7AE0F5F35E69720B5BE8318F7033F49E92FD81CEB291720B3160C897B6
-74F5865F950CD8769A92DCAA6A45BCD37DA94DB12E5C12B942D1884E5D050891
-B24B82A650D059218A5DBFF61B6BF399C916A7E1D9134C1AC1ECA2D2EF33C249
-4A38B17EA1A050FE2D6F24F4B44D03633D37F84636B2035336C7DF456C23447C
-CD73BA41C1D5A811D06EB84BBC21AB877DD9BC3FF1949DC783A184BDDAEC71CB
-13FD629F24410728C2D96FE91493C54E70FB17F6B9FB28B1B6BD03A2610E09E7
-2B393DC0B4F138C003B3FB77177761E7B84BF343C940CA39B6C8E2B725C7F055
-D559E296F87AC291047F0068D3CD555D151C1EBC85
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
-%%BeginFont: SFRM1000
-%!FontType1-1.0: SFRM1000 0.3
-%%CreationDate: Wed Sep 12 2001
-% Copyright (c) 2001 Vladimir Volovich <vvv@vsu.ru>.
-% See the file COPYING (GNU General Public License) for license conditions.
-% Converted from METAFONT EC/TC and LH fonts:
-% ecrm1000, tcrm1000, larm1000, lbrm1000, lcrm1000, rxrm1000.
-11 dict begin
-/FontInfo 6 dict dup begin
-/version (0.3) def
-/FullName (Computer Modern Roman) def
-/FamilyName (Computer Modern) def
-/ItalicAngle 0 def
-/isFixedPitch false def
-/Weight (Medium) def
-end readonly def
-/FontName /SFRM1000 def
-/Encoding StandardEncoding def
-/PaintType 0 def
-/FontType 1 def
-/FontMatrix [0.001 0 0 0.001 0 0] def
-/FontBBox{-189 -321 1456 937}readonly def
-currentdict end
-currentfile eexec
-D9D66F633B846A97B686A97E45A3D0AA052A014267B7904EB3C0D3BD0B83D891
-016CA6B55C6E47AD7A9A958A6E22E00FDD4D6492D53ADDC90ECD778346C06747
-57609FE8907DFFFED75E2CF963A64C7F72488F4A02372BE681E9BBF09A9CE5A9
-3894F6358C244FCD46C148F1EB60DE2137E6D3079D6AE03B3724F7D7BBA47BC4
-41C27FFFDFF9FB7B7738A8D88C27573A53E244723E07C995948DED2516B6044E
-ADED62C496A56BC14483D307884467ADE985655A4712DD06ED00811F9A05BF9F
-BF2AC66203817289FFB5BDCD0445293981AF6F55928C132E885ED009DE1B5FB0
-C230370EB5156A8B609E466F00F768F0A52ABCFBFCE3514C0FDDE31E601AD508
-2666AD26D9DB386B9FEC80AC197C9FE7447928C0C6A2858375F0A1D7AD3BE53C
-9A926DDFBAC60D846783AA97CB86F804701BF53F7C4D18B925FD604F60231215
-EBDF4FAD73F2D13518E1901C3DA00ACE65647765106EFCA89D1CE17ADBB75815
-7BF819C45DA64CEAA10062501C3B0FE0387FD5406CBDB17A69376AFED2632E2A
-C400D16CA3657327EBBCF7CAC55A62AC9AB3D07691C97D98ABFA2A4C85DB2345
-C8773110004A7812B031AB3F9B3AB9C7D0E5A2317931334466110BC5C95CE00C
-E1CD16242B71CCB962978DB5B8FB03BB2FED25589D10F8B3861F73DAEE17BC59
-B909B17D2510F640D341330CCF08ADF9E3106B0C8BB0D04D5F939FAE21AFE501
-4614CBFE82CAEF30ECC2B6B47B373FAB1A828AA3CDF7B59BF013442EEFE267AA
-AF153EE99EBE4743CA764DA09185666446630553F3D278E1953BFF08FE477C68
-4661A47656EC28B2039365CA017F4F1B6E9F85525565795336F7136A054E8C15
-A5DC42CFF335C364E4CE3AA6B2D994C06755AC8F47D2077CE2E78D55C139FF3A
-8FB1AC9F23B06E08130D5636F60DD5462F796B9572D41602B364404046DBC3C1
-2810C5CB192F06CCD0DEBB630AB851F83DAA632969F031210CCAE081481BC26C
-70241E3B6A9E5D5C9D03D0CB3894B67C56FC42B85256FD869D386F4E111424A8
-5440D6DD0F8339C5B26FF77B5369B85AEBCADDBF3B8F0497D01DBAB7D519ADBE
-D96E0CEC25689C42CEDF7DF03D7E272CD37586B57E786E92070292E9C3E1D47E
-0A6896FDBE0E928D5DB66C5EA2E6854382AA5CA5685B9153690C89F9054DDC6D
-B3FD91105C0A009CEA600CFB92229B74CCE1D5CD54B5B98FC3BB678BEBCDFB46
-C6879344596FB5F8D06F944125CDF74583DD980518AE2D21CEFDC37035CD52B8
-F789FA9EFAE3616AD9FD1E3DE672487EEAB7641CB0BD529CFA779D760050C8CA
-845F90A4A3C17D3345F693A399DCA2F57D33E98FF89327E11F4488C1178F7685
-90168A50018F480BD4A37773E7E94D1CE78A7042A09FB8FDFC8825307CBEBAC1
-70EF577F4FB5BFCF260A4A974D2819B6AB69628EE35FB5C9410C2DD7492E5B20
-ABE6A0B351A2C7848EDC71C154BEB335CB8D729783439C3C30F66E2B5A056986
-8C1976D07F0EB87DD9A66432ECCE06E3CC7AF6A949BC0F04038ADC737397AE47
-CD1B4DA2FA4D345E513FD2989E631538416DE27A398249225FBA2283D19DB053
-32FED3F58AF914AE91715B82C9609E21115B51A1BF84E206CE9AE237101EBE5A
-D2A733DE210660CAEBCC0624FE053CD1BC4E240BAB92A63D02BB936FE3FC1B51
-4C17ABB4CFB6B5D336695D6564C4D558F15D8B8DF67E2DCFA2329B685FC7E54D
-643F7C28AC6661022E895E2BAB631ACE06A9A9FF209EC740EB5778F383FAD114
-3830B37E5F85BBAF87266E04926AC28EE58208E5FF3A7F77691670E52EAD9547
-7C862FDCC7E38291F9D57A5CFC242C3A6CA52CA6F1FD70DCBD7775A922A82BF8
-FE45235B905B88AA1F57077E40DC39A24FD0F31FEF0E8AD8D232194435E1E46D
-BAF38F0A1DF997F7BB595A7DD1FB0641EEAD89461E96EB0CA9B8F74507554EF5
-9D717625D44575E168799E96910161478FAB68C09FBEB2C71851C9A266D00F71
-935DED5BAF7ACF97F2903EC9F39DBFE5034F884D07B3DCBC37AFA1AD3FBEFEAB
-15171D267262E0EE3A1B308928220DFC4ECF5B47D69E05FD209C78EB04C02E57
-BB179CB25CDBB9EED3113315449A91166245A8E296F5506423CB0976CFCDAFE4
-8A6325C7CC8C296ACA9F65445301BAED4B5C0741D4A6E842DAA661EDF41F56AB
-44A01ECBF24084E8328724C6B96C4AA9861BFEDD8B868D0901C0F1A6D8DE936E
-063A86D882388FFE83164D48F8ED5325D93A44718CCA766DB7E79308A424BB95
-96C01223258CE375CE848749E9776BAE09E9DE0B40A4E60CAB87F5DD44027A7E
-8A840B4655DCC73B3605D2AA42440D81C64C56F274B3AB76DF147153A71361A2
-8CDF1B9EB3B7408A2061915D01EA2FF8FD0FCC2671D7598440AE0BB0BEF2B686
-CEC58565836FDADAB8AF8B41781E12C156A0C13ABF92BFD5D3AD648739B45BDA
-63F1667EF43B5BFEC525CDCD5EBDF6055A56F8EFB0F344029B4FAE13F5F39D43
-D1BB90436218D25A2700E4F9FEC0024E40A9EEF27DAF0B9E8644F305289E2720
-0220E95F5B2C235A30D2F970486820AD219033ADF8EE59614415C725D247D1C1
-13A2A3E97AFF7A7C4754B34F0F887D0DA522E23CE4B53543EE23274A4E35AB90
-126937F05024AA805E0C9B1247F592823A4FD66516885AFF7D982BD9961E83CB
-3A428737E1BAE9CE248E218B8F3C6BBD771BA744450ED82E0F6F47D14C8F37EA
-53E0871C69C57E357DD91C6EE90FD8DDFFCCCF53675B9256CF5387097B94F548
-3928FFC038877FFBA23FDDA0BCD20A59239032099C1D4E81FA79D1B73F657FB6
-8AAA09DC49CF836758C3ABF74F86BAD5DEF2C0E27A67924722964C457907EF85
-7768FA8BCB78A942A6AC7E735519F76EE1819C62311CB7231B90B4FBEF4BD42C
-E5148E272C6A07C62E44B634B80EAF77C4678AA003ADCCE107A62413223359F4
-5D49BE8F9E394D1706FA900038FB78A0042C6E34F9EB2430255451EA8BDBED24
-B33D2C321A8AC238508C65A7891ED5A200D311A5CCBB984CCFFF4984B6C973E2
-6B49D2DE75366CE29B7370714477487F7DB9B92AC6CDC752C1A8E9347AF4D8A6
-BA18F7E20D5266D5122D00C0C12130E00F6F4345E5ECBA9FA07AD34BC3736E7F
-05D1DDF60397ACE0B3D05AF6B3539B9ACF4C51DD58485557CF0E93122F862442
-9EDBA0EC2349B037277B12C1FDB1A140C181447FFEBBFE1B129C727B97DE0CBE
-BF6566D46CD929F59D56E5EDBD46C31DA97B354C30C957C8AC043A1A15ABD592
-8B0BE4AA2722B21DA5486F6C7E238C2B1D51D0941763DBCB00EB4AC62F92DAAA
-C3BFFEDA5D2707EFB6C956FB2938A9F7692A0C7F53F0FD64B09DACC9C7369094
-236A028036BB2DBB9A8BAF17F2E1683E2CBBFAFF80AEDF853C4B6AE0029F09D6
-F82000FD6F9610EF405DCF2341ED099900F9CBF3D4A0DD4CCEB0A322FD64128A
-A67682A05FE781364D5EFEC8F31FF038572A939790B6F8D8922E39B848EB8A79
-6774E35E6A9E4FAEEC157AB1E76F5F1FEB3C51EA2546A25390A0B65779A96176
-3DA072A2F7E6D9C645D2EA3E572DCEE4367E5C48C027D889C21EFD9CB662BCAC
-06E1FC6AA5FEF8EDBDA26B381F1DC93BF9CA6308CD93E5C302B483BD8C5DC96A
-E0A549D43F0F0FF3C26AD6F167A57E16AD3A4BABCB916C1DD38F7DE255AF984E
-731FB5DCC43D4F092C1F2A7C4B66383E542DF5EA6C93D92EE11F97CF96D876E0
-0ABB14CA302180B5F195594927A440961CC682212B91C49A34CBB31C63BC213E
-01333C8680E45C2E567244DD437C9DDA01C31989FD377E95446C12AD4B31AFA0
-36642676D7A11670C012ECB95A1698FA15591CE3DD9459D56F730021623FB950
-B5AD26DFF7B8875FF41E027995C83844A337AF36BFB304EE0B1474CAF944D3F3
-6F6578809A8C34F93467C904661E073277126B478167DA127541626E069F54DF
-0487319E7372F40C4B5B596817F2352D88E60966020B1AC5069A272613C152B3
-67BDDA469E4AFD9A5C6CA5940C6CF164F5A879AA563F78644782FDAD4A040839
-172AE1B40D18E3EEAC3DE65FF1E36B990182A7C552DC797F9282E0058FB833A4
-1FCA23C93202D5E80E91968677B980DD72D4849AB7182B587234FAFDA66115E6
-7207A8E469C59D8D75BFA359D398EEEFF042E3039E13DD9EBA754B4F0E7EFCEA
-598C4D5D03A83FE3E12ABAC555A090772904542194D0FA7B8DF087D28C520370
-0A1B0467A3410C344225461587359DE2D0ABA8AFCE946761C3C25E6DB3BA225C
-7EBB46ACB75BF41ADE04A99CFA6F40A62A8DC06D1FB428CEE7220A24C4F710E9
-390E31647B34FB4F4BF9DFDB4970009E87181A28BECD9DDEF0AD7C4F17AA5DA7
-355D53A731F040A2E03562C91747F8D772202104E707F4E1A4BBECC58D564A2A
-4AE1EB3766EF2447C59CEFBF4DBC586BB076ECD68865DF1005883DC31FB277C8
-A73DAA9C33F7584DBC29C1E854B6433ABB0C95B20A2D15E7B8783FAD53D6DBF4
-C0C7733A6C466E3F9957D7D204A06E5E8AF2CEED07C08939A3DDE2C62A9EBA62
-E260D893C887B93C492852AC88D4C0349125EA311F492951B2CF10C40502BE6F
-43BA2AFD0CFB80D2FCFFAFBC9326373439B566F1D520AEEC90B1CE7814753631
-0A007016DC9436272D0F7D02F07E8865685360068A7324BB45C4E1B14AF5222E
-8260659A7EC53FB6559ED82662A6A71040D5DC5218644D0B6E89C7B307B119A9
-2DD149B68AEB439BEB6004D3BEB951C5A77E2347719C840F9D80FEB166DB2921
-4561FDF5DEA9847290AE36776450A82E332578CD68E18C8694A3A112789DCB9E
-BDE1370D442C2268BD02B689A06E3BF6A7D973D0558E38708EB224BA8532DDB5
-6F9B45F5A779188F573DC300C9881CA3FEA82759F805795998A134028BFEAC36
-8CA611C301EE8888A6B5E23A054BB979C3B2765A1A31039603476203DD8A41EE
-4E5F2458E582904611C1E7D6A5D35DDCA32970271BFB1B21A18EF7A5064CB064
-0FE67FE477C08B31C99A1F412C57EC52F22DE68C10A032E2DB4E9EF0BF7E947C
-AF49A788DEFA49953AC2CB3A80199AC5564A78467A0DE9653164C690E5E1A43A
-A0934806C61442FBA48C3A72C6DE2DF791BF25A0818628A3A2D6846B3F80CCBA
-0D8C4A73AF4A83C3A8A67B5B7C1105A8A616425C8C01430CD53B87B4453E661B
-B5135F61CB43AE29A4BBECFB543F88A65BE5B62BD9292D3A8AD77E104D23A2FF
-E0A8B42D8361F4F4AD697AA4113FC736C6BCE4AB5EC199BC38509DFD6F770F66
-3F30AD895A1755943936612438AEA57D95DF26492FFF58DB28F3E9D392EBCC63
-FBC6312A96DB7AC1828C9F348AC84AE11AEA0EF827A4990AC8B56F7291E33D92
-E4238E710DBF23765DE7F55E4CF0E5E3B1B7752ECEE67DEB3C4B8B5621EB3026
-B1B7D86DBB3CB49480D82EEE041AABAC78B9A0159066C9E1E1B3F0B609F7D6A8
-D961E40A742D4DEF88749B7866BF40BDB197273DBF932EAD731158AE8E59584B
-F2C14FDB41055DF050AAA294962C772E462E596A2BC5859DF71FB76EE853DE28
-6F488D1911107F16D275CAB98E00218FA8EA1466420A6948354C4C2107BA9A66
-6A0419394BAB966F6F8438EBD7C3BF803B2AC884DFF567CFAC4F14127EF9F57C
-9E871B94888726133B02EF8612DB5D9C59FA6753CD52FCAFA6EAD1547E674B9E
-AC2F89769561942B30CD8F435656170684AD5F833A4FA58300298B11CCC10DC6
-8BD3C456E755A3C7659ABBE847174A74375CDB6AC5EF4370E07D7B3AF4B2CD1F
-FD6E1BCCC6D554BA23AE35137D9179ABE05CD7F44E3EEEE83ADA9D54DF5BF992
-DF73B6ADABB828E32E0E5E776B6A4EE93F19E0C7CADE72564CB02A28FBD48EAC
-90FF5D7101B9A16DAD8F0CB047B3AE8446D1FFBBB040C8D257870A08DE2618D6
-9C46649DDEEEE098F242169281079AD5F94F4D46106E917A6D8E5C341717EE4C
-4E5B30C8EB8C34A6B1BA22E733B3FDA9F9B21E328A19BBF80843B2584EACDBA1
-3ED8C992268C3BFB41C1BF8699D1A13E6DB023FD71495D647DBB227A144719F4
-00805345777C502E4DD741CD96F9F3A2E9A8F1935AE395D789B19C45C34E00F9
-7E97D2DB43CFAF1B243B7AD72631B7A9EF583A03CBA575788EB9B9FC13053A7D
-2ED3646C0C4EFD1B5BF8E9EC27CD83CC3E5EE9328797E9B2711285B001D05DD7
-F47A20ABEE6D518129A645176E1413548F70D8B645FCB5729D3E371B43BA4B41
-CCCBE44E4B57B7363E38006F628938193BAA442B075924607D035DBE1253BEC8
-68510AAEE4FF4165FE35E149F14A7ED8305E2C673A29D1F779DE999433EBEB76
-456B69DDC90A88CE30C854EABA1498CDEF8BD9F3DBA0A1C28AD58F4C24DDBDCA
-E422301F9D4C7E84577468E2942E4627EEA57F01D7B319F8F498EB827FA3329C
-744C038CA5E93FC02A160331EA4C88D993A41F182B7A47EE9CA676E7D19BBBCC
-A0DB5E4D458BDF3DE1588DCFE5A854C998C7DCB12CA41F02EEE710E7AA734227
-DA8754202ECBFC7F94C8534E760D1EB092A16569B09343888C8BFCB4BA4D75FD
-B0B027DBE706DC8A504273FDD95DAD898911647236459B07957983587B8F7265
-4188680A02D5CFA911032205BFB45CDE8FB95873D394AA7CE5EF8DA0E7F02425
-1BB0EC195873B5FD273B3093EF21DAC4222BAD0927B55FE301E0FCCAC9A7BE0D
-F9C8123DDD1FE98240762DF9025D6C30DEB1309E95FCCDC39266D3E4A190F18B
-AFF8145444A7DCDB5273C7511CB4676FAD01FFAC7B89E13A6F1745E4694A1E16
-6823D7AED054EEECB7711D6F0D5A93815ED9352CD15484C1411E018549DFDD11
-9754FFDA86DD1AA3B98D810436824DB68165D8994030FA0A897B4D235905878E
-70CE626B47EE5C6C45364246A167EDDFD67AC003084D6BB74CAB963863B3D691
-578C22DA7FEB9E4F12937740FC7632D193CFEB06FC43C66D1201EC8C699C4F03
-FE04A62538384BF244A807198071847D6446F0DD57F541F3161074E3B41CD919
-5326E283FEC7943DB8616B89DD9632E1213A919DFDADFD2B6E55C511820062E8
-C72ABCE134A3479BF750E341F372EF0550084F40A06DCA1790E7DAD0CF58D396
-65E2C28B103AEE91740E2A3BF369ED246E697AC0ECBA84B0993E312892B18CC5
-1B2055286AC280D35634C288550DB20C2619F4C14BBFAD0EC565E737CF8477DD
-9E6268868F98D03CF2BC22D2EEB9533447DF8C324BF709E951E6E688E7186D30
-0837F93F3BE85FFED7D5EC27E0388F551282032FBD3217F7EFE75804C70BB9AE
-4309B34137B90E4417B0C5E9D85B02E60F4C6D5341C850C8AED4239A550A850D
-AF7CA372A9C7C4FCF865F9A22253ED79C70534B5B76DCB93A22FB9658B4023F2
-CB37AEA49B6707443F7F882AE90FE5927569CB2EB20409F295F67DC7C58C0215
-FD9FFDF32CF460832254061A2E632AA48264F9A14CFACA295C846272F1FBF107
-7E786DB51FCD79924BD3CFBBE3A4BE19D82FBAFDAF96BA395D0F02753A2401D7
-26FCED7A6F36F438A5C0478BDEAAFFD1706040F93AAC1DD9A616421ECE4982A6
-E06F5F015987A8D0377B0A329BFAA39EB5F85BED22992E463158141E2B98A8D2
-C6AC693DCDD077425545D1A85B96F792FCC991DFF2A444F01AF5C5D0B311EFE6
-AF127E30074DFCF486F41B2D86C404C1BBE3AA3E9EF090367BAE451A303D6A41
-159F56CC2695CB214296C9100E09A751C10AD9809F58BF1F55B3EFF6084DADE6
-B065BD20BEEBCE9EBC2BEF084C26F81DC1CB69E49659140DADD4CA458F966944
-8E4F15861C21A44A7CD2DA1C3F466BF4E857E48A7AE87E62F7F3ABECBF57FAB4
-DA37992C12F98C614BF0BCF98668E3F24338AE9B7DD34F72BCC6858F1F68149E
-4C7078836335CB3830C3B2E11A6248C4485AFEB935764507DAD1D156FEF121AF
-DED848C1AACBD7A024C2FE254B67D6A21F2B50FBFDDECCF6193CBDCF1336F8E4
-D8E154C278108E93449AB8BB31789982D566148A8850A72D727146622E76B9EA
-470066F36B30E7BD4A284E2E82D444573D6CB83D9A7BEA26F2BC85C2E56055C6
-1BF45C869DD22F3C72E98AF8910F5563FD678734863351A9658DEA635D04CB10
-803B3002C8A34C0A5D928469C8C8E6BA569DF26A74F7A8D5A62FBD9D6A89DAA8
-4D6638A415E49E919F3B1276071D81F9578FBA995DEA9DB194030ED94F94903E
-C5185272635659CE152AE8FD1E3E418B1B83BAE915F099648D6FF77B12E4164D
-577B2E68B3BB4D0707DF97F5BB698636E7B8920ED125D8D57C331FF687912D6B
-FD8798D27394AF7F4F0012382AA3BBE0CC5384D1756478B78D2A4912465AA29E
-75AED6891EC0E5A59156F005A297E7D0CCD7A756035987F6A5346041A936CEB3
-0C5D2010BDBD866DE57AA7A10C10DD37A377615FC761955E88A9E462426A9F04
-6987618DE9906C730EE8CDB2433060A700AAFF7C1EF561B5BD2B6C371C8BE8DC
-A56E15D6E646EC32BA4FD02BCBF9146D5BDA14F53765437534FAA86A8E4D25E7
-A0751195B28CC547809329AECAEE551B608C8BCAABB224C18433977140446D2D
-AE060B4D7C12AB3E3D1F7E6724ADE6D1D9E3E1A67BB68257AEB962FA85910498
-8C95C23E250FAB1A65B10806DB045CAE0D07C101288692191BCF9C3FF4D5ADDD
-4E089905350C682DA4BC85BE0B5CB46EB73650F2640205DE8C16112ACB0A383A
-F510EEA3B982B25AB0F93D296CAAB4BF0452C7BACC8D65B001332729CA1B913B
-6C41741A8706EE125994271F0B5B3A5148DF78B2022F0BE413CEED24F5B8C579
-9479C0B57C8051B509168898F0A39FEFDF2C960468100A145D29180BC2878F89
-82639A22D4B5C215518A53BB54B02999698ABC09A67527FF711B3D85FE62F9DA
-7DEA4ACCADF5182E7A12026AAD54821B1F41AA1A7A7519E343CBF0A3ABD99337
-A09AC0E24A1304B93408ABDCA9B2C1730401C35271F36704CAEC1A529C1A7B56
-EA04B8ED502534DD90080F5DAB27885183D9665CBD6EAA5B20C2BF4E401C1B6C
-3B4FFAE53351B23B3F2564A9012AD2DFADAC4C372E4C019A9C4BD0698C165698
-4DB029444F6DE6DDB7E52D5CE34C08E8DF98C6DB6D919A4DBDD7DD4B8F205C30
-DF8D13F727ABA4802F0AF842531FBF5E0C9B1247F592823A4FD661C56D618EE0
-795577D5ED25EC385D5B226926FCB6434473B77A07B20C78DF99DCD01FD12112
-008036A7907A9DB3C16EB097563A4C92EFAEF890D326F10BF2A11281521268BB
-5301EA6D07BC9BB8F9480F3AF8A3CD29D75FC977F1D5C1C5A4378F3E7135BA20
-0F79B1AB0948DCC35C3E6C2AFBC5585C31DA3FA5F356AADFC778254D8CDD4AA8
-165084651EC81A24201AF897B1D8302690CA150BC09B08A61AE9DF20F8083439
-CA6F46FA3B8D40A76F33EDB0DEE3AA7EFAF24577849E9CBA64AACE3F6D272193
-D709C5A9B8CAD7CB5E32D0FCA727506D064E8B324AF1D92A3ED4AD4B797C0CE9
-20DC63A01D1490C53B9A91E3F22BE45C2D6F1BA4570F9C2E4BB6CD489175DE3E
-7FCCE905119830D82966E313281CF175BF4A02A4E4BD33A157D34E3A36070989
-EE94FCB35E3C0A16CEFDBB6560259437E0DB5D8E13419C36B655F11DAAA8D795
-1BE78517A0088804099D1AEDA76B839194716463616218D2CA3C534DD2A83DCE
-E4B95082A10E8E04BE4073CD3360E850730A1086613A2FDF97981EB804B358D7
-2858D1D25120FF3149420784C4C7F3A235E86088B3BC53306E0C6E7DB595F7FB
-95599C75FA4BE52C24C31581720F2C4FAD37A635BE422C1591ADDAFDB0B100AD
-D37C1E564957ED7310E67438FFC63FEB697077B3801C21F18FCE12ABEB1C9949
-A52123E6333A0AB8699E2A1BD96042E480EE7CB17B98A3967CDD77B448449333
-6AB5E89D40F1B0C83C5BDE3B1B91161CF2F197157BB0FB6824B33C511CEB1DBE
-4BDAA1224952E9325C1A491C31F98EF3E461051BB13C89FC4E59BCFF14F2559D
-AF8ABEEBAC75E9F2E2CB4EC847B931D9857C3B16A31B399274458A9A8EA1ECCD
-C25C60E8A164928EE967F7268C30C7B204597577BFF28F0565290B0827C19A46
-E567FEE4D90ADC53EBDA0EE7FB4414650A0311A0D89DF6A6DDDEB3E960E1FDFA
-88E6AB0E385830AFA2263859644C302D4B0F7D629E27D5F96365F28F360936D9
-CDB35B049FD91C042AFC47494C9025BF6134E762AEDBA118ED153CF2CD73DFD0
-A97DD66320CCB3D57E6BE3EB4F59843AA5D748BAE9E2F7B45AC79C44C9C6E094
-849D6EE2900C4AAA0650C2CAF200E1F8948C114D16D8E04E5B37E88852235919
-4529FCCF947372ECB27BD2636287654006B368FC50488D4E5E6E335627F3FFBF
-CCF21DFF345ACF67BFA7C3C3E2988DDAF1C1C8B655548A969D432D227A34FC33
-E497FC0401A88EC6C5EBAB2EB93AE45F43A20BDB91831CD7DDA151201C9120BE
-4991B5DEEFFFF4DF109F46AE10AE5316F3CFA69EBD674FA754E7EAEA3B458443
-9D34DDD10C20B0E29BFE91C393F64A38BEB5A2A18AC8C48F7238152E496B4134
-C7E3E3368EC6EFF8B80E1A4FBCCF67BE85C01E69EE23261A0372C6F83E579F27
-6B4478FEE973646B6E717CE9A1DB92A7F896839267A93396495809C6B3B4BEE2
-521324C2BF474BF1DA8D317B2053BE6C071B55907ACB1A1E4257DF179671B533
-CE41F0FC1C372CFE35BF066C34DB109D3925CC15BDA9840B9B9CC28854DB2D25
-E958FD52B8B85F5F4C08682D632C6EFEF3EA9F91771F168792F7B595A923E703
-F053C1379F429CEDCCB1CFC850A30E51CFFF5F34F292CEB37EDBB7F0B90805FB
-72DC6E795A18DDE81C99766134F0FE694BE854C3F6DB8A516B41B37B8731A157
-2344FA5F7265890DC8E107A624F0E3A9DA8242D507E267481CD15AFF67B2CF6C
-EE942F67A0ABA8D0FF2FA9FC89057F26F5E4F613C4D50E879D955834D8B57860
-EB209E5D3A05649BF179DA515A288478CCDD5814AD3DF03ECA6EC567C589077B
-E973B40D709C856EB500E8B0F68ECDFFDF65B4D74A7E48756142547DB43E1DB3
-08EE0AA452F417D274651C0A2290F147A4C1A34C26965CAAAC2C5026600A5584
-E6D37940939D2ED8069FB7CB9CA174D8A84F5D7914A2F3A209EC712949F1E2B6
-772F4BCE71D4A4B506A966D1242954A80600EE3ED05672B457D8FF1C5611F5B3
-42B1553FA2643DE22ECF8AAFA7F60D7D25E1D0E9B6F30672158A5779A6802E2D
-FA6FDE2EFDB4C68AB115DBC45077B9BBEFF0E498AC4040D939A89C378B22176A
-73620D97B5E4EA1CB56E1CCAC3F42B43B61F708BABA1C0C34B7AFD27F6D4652F
-976633B7F566D32F1196F3C52F6957C31A3EB7D6B01CB47BCDCF769950AC8567
-7C29A9CAF1600662AA1244171EC66956E70153D62714A07ACD1FFC9D96703EB3
-0AA4F00C5D894D12CE8C51A971E34DDEAC3960039B6C949F611D1F4DE43BD9C0
-A148F4BF13E2B804E7AD2B882CF498FE6B3C7B9818D3B7D3B6F77A913B7DE079
-B27F8F9F8C86D8D507AC1FC45D541E1DA1C045F4FD8DBF4C824594E450D7416E
-4B4AD35A717D2A8506E9720398830C106C342F853A8ADC462AA8FA3A05598229
-BD14C828AB255F860128995EB7C8D61F14F2A7137A0BC12E17A15C58FC473154
-F14440BBF863FB76057F4EBBBF2A1D8221F9E9A0C65B29FB3516285924E18F07
-27384F65035B1158CB8AF6B4ECBE34ECC1C92BD43122D50F769BF2635DB3A6B2
-809013C7F3BDFC734C4FE9BB0124492B397CAE8063F9DB7FBF04107A9732BBF1
-DE23785F7C93D8CF4EF71CF5AA2B15FCD672EB3B04BF0C20F2BF7DDC6C96DA05
-B51212FC3C15A1341DF03FEFDD72D3ABC34E8CCF7D3B607C058336EA3B39075B
-5D33BBF0FB0D9F6D1007B5C863156EC1636E573FFF75376588223CB5CAE66BBB
-DD2F28F62A6CAA01A20DC6ED5A1BBA09D3D2E2DFCE99155F8560A05501371B36
-C77B9CE789A7F1A25BB7E76970E14CC4D68E6A9F965AC81144B2C7A3AACE0F16
-B204918623195E9355B1CA091A4E7DA97C5C9B44EF7F4C684B6BB7195CE4CC15
-E287E6B9920195C092924B8AACE106D06861196230930C3BD9127C11C9FF2304
-428ACB7AAE7CD7E03F532CC982DF1C25E9AD6277642A8F3DA96322CF2F5D6E13
-C91D1370B77CF7193C0882B54AD63C130BC46B3F28D248C9EBA436D460355880
-DD260F8D71419DBF63E5440429CC98DC77C52DC3B8DE77120720FC8AA96D6A21
-30FAF109A22DE2C5B6BE985DAFF4DCA56A210552323E27BA7A6287353054CF3A
-EDABDFAAADE9F324EFFD62189F1E95F04ACEF0E929AFB87CFB60A8276BF4F24D
-3838D406A98E13C5BEC9B802419FC877272B644165D1DF5C73C752A5863A2DB4
-169AE81B73309EEDED85D8EA7F0DAD22346E6D7292084C9B54AFEAA96DC29BDE
-65BC23762872730DECB549E68CACDEFCAF9C9D91EF5EDF6ED379E1DE2D6CB5FD
-306F441CE0548CB861C8D7E3B2C742FD653E61560560C0F89453A945E332A36A
-296F42C631B8D278A30243C88CA4B1E861486F0DC8961CD57059394C09E56B34
-F35885F657994EC8A1DAE33E25F9FF539D3BACF73444EF96E9B2D1D5EA98791C
-83DDBBA89A6045A974E591706CA03D2EFCA2BB9E185D1DDF9A5EEAC158ECF8DF
-24E56860EECEAD7885CDC00B3E21B3A43F18056F4B929F1D6B75D752E2785946
-B825FE322EA5D4C2395A33DAA0610011102B166D2E179046B511EC03D1F5A404
-FB627E610BBB972F36591F3CCF344D42512CAB0C290380675C45947463CE4143
-29500F0314F1A48D9A7778204143BE17E8AEDF446F747C7C364EB2DFDC09F907
-7349C960579FCDBD0DFAF5367DF13854712FDB8103894469BFF7A072A4BC1E8A
-5DB3DE45991030E879CDA191CC5AF0F5AA4EAF9537010E9E59D7FC5A9E50D5D6
-FFB14E7A93AA0159E380CF5F0062593F64B1DF91A7D4664C8763BFD550A8D800
-48A00D9A295EA233C4642F336B38DDB19F5AED826805973D94A4EA9543566CC1
-6D3B423A5B99F34840B539410A0A5D8E3FD2F3966893386573FDB37DCD596508
-1E7638FFED5E34F70561F300FDCCE6DDA284C287D7F863E2B69CE5BF2C7F9DD8
-6354761166DBF57784BCD075E72C5317E27A4011C0DB293E503F892E2AD632C2
-9F98F3A63182E9A86CEC90A5A7090091ECCDDAF83672289EA7A2B57540F4BD87
-32D22447CC9DD97F3A620431903D20979303EAA16BAE50167B0DDF5BC57E563C
-368FC2CD7A5EA5D9F773FD3D2E8D1832882148100051BE9A99A124C37F99DA8E
-4B3F9DAE12DB3A65E948DBEB692D031F96A76025C00AC519BAAD5F369B6D4FB6
-9034EB7994DF1480A64BB598FE6F7090DE0D19C3220AFFEB9355DF4897412731
-8A206241AFFBB20E758129A7F35FF4A6752FC9E1DA5F8E11A5703CDE29DA1619
-E09C929AD4C3FACFA5909A4971A117518246B2ABA0253A688552D0590F4B765F
-79E725EA40F375FBAFD4DAD73EBD3654AD70897CAFF2471EC2FE30D64D2E5C3B
-F765B99291FD42FEB07E977B8ACFE7D2355E58BCBD94E02CF68E1D0497C5DD3C
-99847FA65563015C802A996F133B5FBFC7A222E39A4B7ACC1C818272A97FADD0
-64206627AE413D164072E7C803D8ADDA2114723BE7AD318FE993D38DEC3AAA98
-5020BBCD6F870D8D390A83349B27672BE6D090E0479B4A0901D7C54A74BD8DFE
-36E6D747C388FB658A5092178338F8659FB80001BCC025B40493AC5A76827726
-D334CCE482851C048EA5CAA13D93F66187FEFC42E3E7DB653EA0C47DC416F4A3
-C2B24B7CB4A08927877E724E70684465D34B23743B6453C7A02B9AA54AD0FB1B
-6C846EFFE12104BEAFDA92A62AEF4C895A60296186938AD595D3E7EA6FCE8AF4
-814FB2B875C2380FA12EC3DAF09B58F3A0F0171850AD6D916C75CE5BE5F6BAFB
-FC8A6B4AF68BB427D09E5FB2D47D5A303DC6981BEAB387453351F27C23AF8F03
-532D45517E7E6BB74C3DC7A1AD93C29A03FE6592242656C4A98F0A2E28EDF77D
-D7A0B6FC1678B3031971AF047C29FBCD26DAB7E8923845AC28CA14A2D00CC01A
-2243992ED937B3B774B6D5FD4A82F0D1D94AA1301FA12FC0D8B7D2789930DCAD
-864E457136836EEB963D6ED1B46EF76C15708BBA6F90FA081E481BDA28A390D6
-5E9A37F8AB0B02DE5B852D4191BFA0C3F5554F0F8186CEF21EF8C4C383F1BF6E
-1974834C58792A2B87DA951C2F0D52F8860C6A8D26A9873AF9561C2AACC8C899
-8B1FECCF491A1574DBB58A1C5F136D935B95F0A6E785B86F0FBC14613073C42D
-B8D6FF8FA86578A22D63C06CFC2AC3BB100F1C883072DCEE52154377C2B9A8E9
-465D60A64C56FC19E61CFC45920FB27E112C34E23948D65BB3AC06B6382DB63A
-E23F744BB1D936332AB3745769187AFB47A0133512C73F4D8EDBDD43B779EB6E
-DC0E422BE6339A43C224954178698E838C5519A1D839BB41CF11EE97B2C26BF4
-7CA9C5D6E2CBCD435A92A1A427EE0F0BB3EA1BEC0D1E91C80D3A1D6E3FBCE208
-0FAA6C65303A45147DFA54F13132D662BC22FF5188E31FBB61E185C306FA4B8D
-07A9407EB913B0CF46407B012F74B242EE91E49232CA891BB6F44013354C6F60
-8269BD1421DEFEE20BBDDC308A1594FADCD50C57443EB3E9DA038CE1AFBB215E
-558CF8732A643A3E872B40D8F972995B8885560E5013507CD300C8097D0FA096
-B89593EF262C5951D69A325131D37F94D841BEA633834CF9119F9D32981F9F24
-B5F167AB828483A08488AC0EDF72BBE1B16BAFF6AA7C72A97F769CA412E3A1A3
-3A5137FAD91FB87C5ED4CBF4BE19E38C8F82FEFC3C0D86FDA37B588258B7FD69
-C96195ECAD77DAECBE37AA065E7FDABAADBBC2482A84A983B1D6FC6BEC6B66C2
-488AC43CAF218059F65BBFA205E9803908FB4FFA49248CE056296BEA7A56789C
-0978CA8EDFDEED12B8CB85A01312AF855EC909FF285309DECDE04CEC2FADE907
-7970AB5551B3F3044F2672917989D1A1D235707F0218FD63FF71B313F10F88BF
-77D9454E5B86C9586D5971176129D7A47939238549A75359DF402AB3D7B1E6F8
-90A0ACCC3787DA0A89646872315271054AF016B6DF90387CBEFAC608C9D9EEA8
-26AB565CCA3BF7042FC15259AC9009384088995A3D51C87F30096BF2677D2E69
-FCA08B573AF910E7BF3BFC68CEE469A5D43CB25A903E2D77A4AF7E431BE839E7
-2D4DE8488376C1312B32C1388C67B6BE84FD9C2F0379562523954D8A37E50D1B
-FD1E53FEFD6709A3B7663213647A18FE44251A38D552E21571C41AB78C9E6CC6
-1352497E467B1898FFF92161293FA538599EA073CFC13A4C67B5BC2602D56D9D
-34BBB9C4A5885970D4DB827C41CD812D659E49F6DD0D9CD6D9BD96737591F86A
-7BAF41608E5FFEF7864F76265CDD3368BF096F85076B374E78D4336C9B0D786A
-50CE8CB5E1D6862E2579C425D422B497DD0A61D6AD28F40B482710FC02034D43
-2B1890DB210CC277254FC9BD9501456B8225FEA8DF1C112295F596D6AE42F13E
-EE59B7A725FE363FCB85AEA7AFA2860D420E064914DBF6F4D2013FB9749330BC
-CB37E8950621262289B1B7BB265075AAE83FE40A166529EAEA7C04B32C077C1D
-EDF5183668C9C42C319BFFFE729E6FF86D4DC989D50533A2EE41817B1B58CFD1
-B963954AFF54F04E22F0C3C724C2189075A9DACB00933383F00B21A098739BF2
-E2449E6B9EBCE2997498579A92B43B6480F4FA07A89D9643B63E1CF6DDADB36E
-DF4CCAB0F285164F3F67F5BD1670A7F671750BF50F1E5D0064B35F1245DFE167
-DA31AF15610D612CF82741DAA87C9DA7A37EFCB2E5144B1E269A33394A1EF019
-74DC8777576F8BED09FCC38FE9A3D2085638CAC31CDDBC2CA8615ABE70E9FAC3
-3779D68F2B8B73C9CCA30266A231D674C44ED3FC017E955F43B9B5D780267BA7
-2FED48D96658269BD1E6EB164FDCE3055D2CC76B47003E47BE312543571F4CB0
-102FA8751F36521DDB32767C1B277589259BFC81BB97FFB0A41D485FAA543358
-6C59593C7978279C030154DFD4667A4F6C8E273CFE145A86EABF868487AB741B
-19C602C0B03CDF0FDA0593B7C8673E3EAACBE78C4787AFC3BA3B12C759B8916F
-017BC5D20C9A44079F6D498A1C25B94826B5333D18BC4B8C6ADEE04B65911FD6
-42896B0285ADF7F35C5EC1F50FE79DF97F8D2B3B71AA6F456BE3DAA660D34D02
-74D2BB73D36F4904788B2DD16BB226F98B4BD777E155738DEC48E943E61EEA3F
-BDE79DF8345ADF83F6B6D3957621050FB9DFFEC6F9584BBA5F1E478A5B5DE778
-D2F1A4CEE58283C8AFDFB8E35F149FB8DC9FC2E16E72E28ED76A2A09BA282A1F
-D0E49578EFA3EDFDE303C71FC21E9B96FD2FF08831244583176D584DCB1D2233
-C86A5AE43D621777B513932F82095BBE4F8762751022D37595B7DAB995F65199
-C0AA4C5E75B594AB52DE0FB02DC65AC91FF4346B4896FC3359EB3009B5C1419E
-72ACA9198E1D466CE84EA09E097B990F5E466FDE2E891E7F8B0D13D40C311E9B
-82BE678F4F785AB9BB1E7F576AD26956C9F857CAA625D457157665973CB8AAB8
-1FECA4F9221BD05FF8F8C4B89679147CC37681F368489D9ECA5EB6239F91E141
-037EB988BE2D06F88A17E5633E78DB9180012F0F5AEE29F15A5F117B6C954771
-55EE4443DED24466560091C6267F088C409BBD078E329CF3505FDF91EF714A69
-7C43CBEFB6679AFAFB68F0DD80AD2EDE4BE111A4CD7AC4119ADC27DDF293C981
-32EE548578983E7137939BB871239042968D517931A6F589330E4BAEA98ABD74
-3FEF957F2F46EF50D401E980EAB3FDD90CFEC312B9F0812E15E8288A540BCDF8
-15BBA03705A0ECA18074D48E15FDE6CC47AAA10BEC3CEC4ACF8B5550E537CE67
-90655A3AAD5F217E097178E4367E6931E63903A93217C68714F2D465C1A4C3C3
-B9B764B201D8D93A82BAF2EFE3D86A5DF79E381D28264FB88D912E1D77902ADB
-21EA9D2219D153584E94F9FDFC2325E5F615A7E600C6691A54DA416ACCF5ED15
-1D53E2FF69910578BB1BF0B0EEC4F999F15176D71AE7537C87F9F800B5754CDE
-E7BD92845C78AF1656610B36DA4DC0DBA53E19D5288394F54908863AB68E95BC
-90052E32FCB6390957B06E5A42722F8DFACE67A03675B8698089E8152222401F
-C9C8CFFBE0375715E4C30AC63845B23BDB4D840EAA8108A67FF7591642BF9B67
-325D3991167F89DFA624F1807A25E114B182E55D01CF6CA05BF8E259C5FBE4C5
-FD0FE95DA708294C72A38BAF210B354522DB91D286D266F6C81AFE11CD0709EB
-BDFAF570ADBFC20A39D6FA8F8BEC6009B6785E7CB4CB5D7F7504653D6C52BE87
-CD426944523A30005209D41636C2BF62846EDDD45D13B463FDAFD4E23A849A40
-FDAE2096F1E621D4E37AADB4C39E6785812BC481598A270C5B9D581EECAEDD8C
-78131C4EBE23798B9E58BDF8C74CE05CFFA998F65DB1A30D18EAF50C4751F85F
-578FA29E32D03C428A1CE0F80C12B562F3B844624D72CB78010859F2CB54CEC1
-2F7E69FF6478BFAC05A041898A8385D0FB6BB1F69C5FFB7590804251C7C84ECC
-327760A145A97673ECA9277DC026FBBFF0291055F564130BC875C5665A7B39EF
-A1BE2084901B152495EBBD8A6F47A0552D553C23248F2B0009111656145E033A
-ECE1F226E79CF2E061E9EA17CCDECF783B81E18B6D3E4937B0CE938108C4660E
-3FD4B431378B84D43221BE9FC86D81C5D7F08AA10902A068936B8C1439700F25
-CBBBC8395643AC598F133DDC673827B5556711B6E34A554457147F43029E5F96
-5146E572064831FA3AFD7B1D2C4340933C0ABEFD8836BBD9CA6A0D11B76DFEBE
-480CED36649148849EBC4244757F735E53096F608F33A5600A6E8D540EB6AD0C
-20F4C6FD071BEBEFE1C4F405ED2355BC2EC089D18EC8D0328412DE548AE6C6ED
-3D3B170635E9E18433600FE85386C2123732E0F48FAB34ADF478EF6A15BF0C7C
-3A83AD9AAB014D1565AC521A29AE6717E57E3A201B32B88EBC7E8DC58EAC0913
-28682A1B36B62A57DF1E920CAA1CC32173E609C70AD9EF2B466A32A57BBA0E99
-2189E6AE9DB4A3809B5BE2691F103990FC64D8523D13EC813393222F59911045
-73257885DEBBDD8EC3F13BF531962BC50B7F83A6FE14047B4281BC2683DE2FE7
-F98813EDD87E65D129AA30DC8C7CFA636A933F7CF6C8148DD5D9B4B362911EEE
-EF3FC22BDCDF68D998D6B22DB90EB63BB638C8B1C95CD991BD958E0693A02D86
-57D1589443DB506CE7001207F7B2CE7BFF543E1F5A9556776B02C6F2EB9D26C3
-2E68460D2D911B99BF28161BF454F328430D41BEF231BCD413E5B62C0B137606
-B331843027DA93FD6409D468E7F207C418D9F9B43878A271E765C171EFB44B17
-41083D56B45E57C9CDEA401AD81CFE5A7BB360D49C03A5CFEC272EB9DC4CB5BE
-6D9EAFC2D428CAFC8151BAD609C48E75B40DB9C996BF99F6CCA12AF4801AFEB9
-0907D417E2537811E71E4C8ECEF9F2AAF6DCFD9F98562B77561280A5373F6A5B
-11E9764A322EB673EB08E53ACBDA5BFFEF0796D41D04EC3CBBB6355A361A8C30
-B1C312C26950D4B3DCA3594A3BFFE53A5574EA5520FAF1EF6EEF7F1A1B3C62EB
-400C1D3975E6E0A7EA95B7543797BCDC917C44BDAA8AF8842ADB73E6CD95826F
-C496F73CE76501D712078FE6801D02D0E0E173DFA1D98C84E4285EBA15E962BB
-23A7A4C5AA06BB88CB36186CA7E61192567CCE04AB5FF208C0A199712E2F1A2F
-23162FE782A4EF4FC664DAEB734DF821FED6AAF92E29A45984DF2091905DA9BD
-2F840C231FA9104AC77F1D95068093498AC1A00253B2115C9971DBE9E482C4AA
-0FFF7B9A9926774BCD6DFEF484A3086199AD2A6A58F14D87CA346ED05A6F363D
-EAE4CEE0E3082035879E4C9FEF9C02DEBFBDBD6B3C0935F1C0ACE06FC7E13A7A
-06450092BE11DB0920581BEC4C011186A7F122F042E8FAAB14B6BCE226CD341E
-83FAE799F59ED9090A70146803EB2F86E4F42B8B84E11BEFD1C2A9C8B61B2A43
-CF448822268F0A491A97F4F6C5DC5B43A9D8250EDAFE4FEB14F24F6303CC5971
-A711C098C81729F7F35B99DBD753C539B86ECB65AA2BAA55C75936E8CEF37E91
-95AF20D9F224F73427A9F000572D016CFFC77CEA8B9A0402C2C46567F9F816E2
-89319162F65A77A4E99FBD9802A63ACCC30F9AAE53636F6916D81C0A28A522D3
-1CF9A59E77E8982F47ED294A09AD1F2A250F4F5ADB0BA9DAC8DA18DF71714E98
-9395E968624ADBBDA27746B0D7CC1B603151002CD636A375584C6EE2FE2105B1
-039B51C1C39CBB5683C4E1BD4B14D0F175C2B873DF772EADF3AA1175D2500818
-80A2F57522D6CA59FB7225373007E2F2CBA005C270D09793011A5DA47959B628
-1B367CA1043A5971A45C6E3240E06C9A80756936BF6325EB6BDF91E97F36CCC9
-A5669B4D48852E840E65DA93221B917976439346EC6E7ABA0FD8541BA614E61B
-E2E8F7BDB89B16505D3D7C47FD3C74B1E83D14C554904681FA19EC7E802098FA
-1FF0631D7EBDC8011F81F8C5BFD29A9F108DFBADBEFFCABF7A7EBC86E44E9B25
-27523B31E0969354056B3704E8844E631F3972518FAE7C856C1918C3FF7E06DE
-32915E48633EC500E54559595732842915FD9817C29CDE1BD68E4527CDA3A77E
-AD9B363E69A665224EBEF23DB3C381A8B6FACFD444EA729A2EE211AAD61C900B
-792ADE52D0DF52057FEAB8001BF8881B256E73D0C4C334054C8664EA864CC1C7
-A542E153768791D04D4223ED3AAE140684F92A9C72B3E6AAD4FB887E457EA578
-74109CEC10D1E60610B41D659DD71C4A2F8FD38951725CBBD1C133B67E947FAE
-3A8AD0736B361807ED883E9567077E8A0DD343BC2B1C5BBC0BC051C8A53C444D
-15D641059119EB18A99BE095CCA1150AB21602583117CD5C5E4AC9F857D00F37
-469AE7A0C9F4FE41FC0062D7E08EB8D8E9128B82DE5FA04593461EC01F440085
-CCC56A662F46A22D07FB50EEB071896D83F85B9BEF82A732ADB0C6BA37072A79
-0D4973A038E2853053DA8A45FB38177C1C1D7A888488A00688413CE0E02B05D2
-ECD672F7DD5A65260ED11711A8941B63BEFB346635C0747DFA0AD1F074B0114A
-E0A65C17CD7BBE57E5543E6D67DF4A4EAD3D338A77F50E62AFF1A90DCA0725B4
-2793296A690D303A0AD24862BBF3B6733A07936598E990702AAE191A0F75E052
-57801DD80B8C342B8A8EA3249C19E0F276671738E2CDF73E9A433BA49A5C3948
-CF1BAE2C669A00619960E265E645C63B0057E5E140D2F0455D982A90D648CBE0
-5433B67EAB2BA27FF59FC74165954C05D77FD3445BA270CBDAB9D5FA7896A83F
-F4D25B9FC040B67462C4DBE2D391983A40C2FAF7039DDF74329FF242C867FCF0
-E8111D8CFBD4881331CB71214D2F63B6F9EDDE7BCE10D108CC73443F4C427281
-70CB57B6B1019340AD05DCC150ECBCFE6E92EEB6FCA584545CFE4663648BE3F4
-6A3A9CD35F1DF7750F0918047DB04114039D4EF050A4C260292A2C758B7A47F1
-0ACF5426EBB0737916FB4F11BA621D7E8A278376DA1C14EF2C661121336D81B0
-037D3FF76E1B90193E7FF345B4CC6936125B998CBCBE15349F1894D1E20041B7
-48A6751B9FA7192F62F7F421E5FBA187188486D17849B5209CA0F8AFEAAD76C4
-E642485A6FE7810033A8ABE856B9E94C98425C60735132F1334A9652F3143BF5
-9D6D129AAC142E3EF0374F2E58BB6DEF36480BC2990BF8A21929AD4DB14B42CE
-91A1B5E60587F84C709693FEDC3B816A260A2BBAB8CC350B082F154173E8AE31
-C92B50CBD0A3924BC6FBA9946E327705771B975D3FAFB0D8FB8AC745A6A91D67
-BE7395CB842DF341EF9B6D83563F2AC654EE9A65182C90D88AEAFA8EA1BE1854
-4BE31DAEDBBB59893F5E4B03964D8AD2E2837B404D44DCF4BFA700A051A82BC9
-8E7C8826FEB2967956F02F09D05D665FE4C26A4142A153D7A38937E3DFD06515
-F63CDEE0D89EB9C58350FF50694624D04AFE896DBFC51B5A4621F946EDF34547
-86169212677D2B1C2407B21B0B08119C4CE2BAD69C1193AA97753D75E2275DE3
-E7F6302DA95E3B53580F20727127FD7CFF5DF4E5CE5E272867EA5DC55566108A
-9EC3705D2B91A1BCE32BB38C9F3B95D30DC7141B6779A86A8FEC66C3A11FF58D
-B32D30E4ED92C8E016A6889FEFF22E6265CD4349B6D956C2E957814F954DB2DE
-799BA1DD8E53945101C2C5952E3BF17D397E3EAA15B900D369F201925F8FC24B
-0E37AC46EBE8E9F9A65680EFDE1F2B6238C5B2B80377121714610EAE0CACFDAF
-6E3E74E0D412020222D476F1C89D2E12E13F6B1FE025B29E96B6349D4BEBD1DF
-1DBD75B5D3016BA270D85895CAAC893C2FD780A00816002ADC3DC7B87B087252
-4BE70E24C4B26724D8B1DECF7FF8AA4F4BFEB5CCEC4E75D7E7326A17AC40EFA3
-8346207C2CDB1A90248A4A51150F79734286FAA1A778D5509148BFD638482978
-3E99A0F19E0AD62F9011EED4A9C200B10AB781CAE42617AB2B556D5B9C1C79A8
-DB31D6D1E2CF6FD906FE031C0555CEAB54A999079A92857F73ACDEFF8F10DC5C
-737D0AB3226D238BC3D8D90F12DE65E3DBE6363E3C9C2CE711179B349733A2B1
-C3E8FED39817FC942A6E6F77D4C19F1242FF494556027BC01488E481D2665306
-3E2FB9869153DDA63695114A96208F3A8A40E0908597521E543B9605305A3554
-C65C1829BFBD44EE65AF78E1B47B1ECCEE9B863C0A050484E0A247332221455B
-1791B8CE5D6BD9C823FB8F6C1F6E7DAE68AF6BD0F237E47A8091AC0FC2243EF4
-D4086A051A32B5F1493B68CA3195D4F379DE7C7A2EB721ADB457E5B7BA35AFFA
-8B72D274749CFC33D9808F94D6B1CD50457F1A62B29EDF379204141F1F5E8704
-CCDBDD0DD514EAABBDF147F09064F334B7FA79C280C5E1CA75D53BF349DB87E6
-C33C5F9E960D8EF643325BFAD04686A2E1269DA228431D37423DC52D99D8D3AA
-D12D50916BD9EF448CFFEDDC9CE27B33AC96F09CFB58A84831594F137AA7FCE9
-70A338782010C94F7EE70ECF37001EBBB6B907044AF6F572538BB9779806A2CF
-DADFF8FD509DE21D04122957AA7837EA48C6C74EEA5A9113B8BF4054EEDD8653
-BFEE326920DCB736B762580CA96D533B36EACE82F90F059EBCA326D65AE6E522
-AB642CE6BB3F729C1BFAC98B0CE631D310BB17E7DC5600A708571FBB219E0216
-606FE121BEEED2F8F97D397DFE374111C19FA21AE47B055E55957C38EDBAC055
-454814D6E9988EBDF6CA74950F34B79DE2979AEA3B3FD43C18A7E19F0A43E94A
-978C3548C21020BC615545AC9B75C6BB37A0C0CC7D7D8448A2CF9C89A25FB81D
-A4FD219C47DF3B80E8F25FEB6EC541CF077BB1837B55B997A06747FD83BA1D24
-596515B43FCE88D00FDE476531F8B841D7FBC1F4B1A03636965913231158D060
-9532930BC7A2CC1FDF2215C20B5A8033B59F711C864B01762C06AB8722F61F57
-A491BB5C6776CB2ED341108C013242F5475D2F19676A8893BF85E733367414E1
-12478278355809D9497071C5BAD05ADA9CD15A32A0DACA6DA9CDEB7629B092B0
-4A6BB34EE05D2E789F9732C7ACB292EA5066188DEAF310FBCFEB02F99399AD30
-B7D97E0F9012FA1CE47B3947A824EEB39C28B1D89DD2BE6F57042EACF571FA47
-665D8A9079DC3510738F3FD185979BE657853F12F0EBD47724BC7C203E3F51C3
-E3DDD6C0AE7E8822CE7AE60662382B66F9FCCE607E3CAC3AF3612EBE2E3E083C
-B2B2C1728A729AD4CBAE78C7104A3A362DA1A4F1981383E0D103A0BC8B3D62BE
-1FB63D6A51AFFC15DEEA743C06614A3FCF40EFBD685D77E6AB48EE882846BB9E
-E860E7B4A6202084871E7FF6300A8E5F8B16F2A86D75566D92780F0580B0CEE6
-D2B859860630AEF80A1FBDDC726BD6B30EA80A3265C3FFB578C4B1E39260C3A2
-389C5FF2E8FBE8EA43E4CD79E54F4D5B5B59FD8B2293242797F61F260A5B2ADE
-0C0B4547EA3F7B0DD04AAB31244DAE58A91EDB297737457DFAD63F1B87BCB9FA
-0AE1C1E82BD8D428720D5DAEE09B46EBEB2602A7349FF303BF69B56ADC05819D
-14B0FDB8FC85A73B4F8EF524F3F7FF3AA39D7160A8E9DD4EAF62DAEC21FCDE1C
-D23C570BEA16460403BEF4C196F74022EC0A24384F4CD05588BFA794B5E0C7B0
-B071E289EED906E7CEB2E3D1ED30D0FB125EF89E13486846FA5C81B128F932F1
-CBD0E31E24FD3F87C1EE2C7A0AAF68B5378C96DD454EFAD9C47ADCA3F1988077
-2660DA5AEE769F9089EE17A4178F58A64A403B519137AB2E5F90D63E155AE0D4
-02B5D9DAE5102946198107DB1720236D687D6D04A21C1DAEFE52DE1E5F2EF71D
-C7EBE02A6C81BC7CEEE4A3326DDFFCE28DD5A858B1DB6013A4A488EFBDAC6C9F
-544A8719FF0D02B6AE164937C952DA80EEC61AE1C7D1642C10F5AB314F767907
-E1D2FDA315D84A8CA30D7B0E15C68BA024EC1AA66A079BD129C457085DF51001
-08682A2306BC671D498B7D135C42C9B260E9EA44171B5234A49AD8FF367530C9
-C7DF39E95B7E302853AF3D99DF356EFE27B0F9862828B69B2B18962B5BD686B2
-ABF4C9D2E968354FE837109AEFEFD7578BCBB155ECFEB7CED3A48225DCCDF210
-8095DED73E54BA52D77B7FC47D6F330F0E9E84DB1D9B083D8423A1585E8C336D
-D1DE7CECFF81F6775B3D71E7F4EBACAEFDFF837009C5E826776349F4D2F7E3BE
-1D3A25B2C140BCFD02D0A728805989D0B396694433B21858E338824DF618A7E6
-CBDE101C5E311C471679B0D8CA27699DEE0C3A95FB003DF172358CA9C34293A7
-323A4D72A6DE8857874C91BEF80CC0584320BE481977BF7A359BA4249BCC5DC2
-D8A2DCD1E9B1555EB5EDC1894AB2400E63810510375E4C72848BBB8A2B4189FD
-09CDF6FDD521DDDD14E4CF760BBA2A73303E53718B53262B2FA1867E5995C89C
-6C47DCA3ED3EAB2EEFB82F121E31653127DA5213879B1A4F86A44D4038660CCA
-09C4DBCF72409686B2406DC9B406D9BD2BFB134F7F2737C84B61184EE543242D
-2D0E1581AB39C26D0E0AFB95623E918B06A4DDA9E79E287DB8682F299E71B2FE
-A1F7B26B8A2EEE3E641A5C93D1CE20B7AECF7DB1776968879ACF768642A52D80
-21D0ABCF1E797A49FBE5A0C424B1DE19613C46C87E40950C64291CC080C3C832
-9C756112F945E72003AC34E90281379A3EE09D38BABFCC6DB2DED54ACE56D7F9
-90E1D9A3FEB42F07BB95F31D6C5845F477985B5BFDB5C6E52DCF62A84DAED840
-2F44C11313946A625875C5DA492867B0DA26FA4BB1A96D92237D1663D3CDADD7
-272F3F7634677AF947409848132D43E8E9860F3E42A1BD27656F3530CA23E6EF
-48DA81778F5387183CB5DD3A59344F5DB6BF6405ADB42CDECB85CB48E4527FFC
-D2A2458ADE0EAAC8ADA5506D8855890D8597BC8F4891D83E942E58BABA21F9BE
-6CDB6C8BC17C2DB20DDE01223C514054CED58E68BE804D0C1472CA3CCA46839B
-F07D4F6CA156EE2AF61CD359EC312456BB0B5C2320103A8A502E87A2C0CC468B
-8E96B1F277CCC33BB475E3D3749F33B2F835CB591D3A80C6154C8889B4BD474C
-A2852CD0004542ECE3F65501C8E3AD2223EDEEA592BA7315B3E9315857324987
-EDDFB0D51B7903E78CBD47FC1423EDB27E0AF64C5CD536513EB7179CCD32AB97
-9D7AB250E019510AD038621C110FC960664F12E2896E098914303524EEB86BBE
-D4E81332710F387271A54656A3E43EBF02A1BEEB3FBD7ED3BE4ED7CB3036B88E
-AFC5F0291249DBFD9B2072C3F1254554C9B1363EF1652DC266A9DD50BF1EB3DF
-623D239EAAAB6333B2BF269D9B0BE3DB020B97ED6834404F5F92640E958A72CD
-36116DA64327E126927467CE722674FB3E120D2185E9466757DE5F70420D719D
-8E2673E0DA0544136FB80CB4C562B498EE18B39803B2B0B3AA834EF47780B5DA
-79FB95FAC386FCB9F7D41851BF7A947B019A5D84558DD5D2D65F0D66FBAABDB9
-B84F04801861022F61ECBBBCB9E25C5EAA4B6440400AC4E21AEB7DBC209BBA02
-7A16B6C76EB5A9D91D1F8FBFE9322CCFA33617C57FDCA52D9923E32522273A4F
-1617D2B9132B156AF2512C439DB118DC19861FCB61189153C099CB5BFF20A4D5
-5DCB4E2CC65C0573FEABFC0C7E21C6E866DBB1424D69F24C43176E44479CE006
-730FE4AE1B0237CBD990B50AAAD05B270E78E5CEA05020C6722F519C9A842F5A
-BE6655B847AFE2A55000718BB9F4B270264A50D80FABEF3EEDD999A3A3D2BCE6
-802F13EBB6299CDA5A5AFE6076841A93ACD6935DCE3D4010C2A533084558BA1A
-9B016D10457B99C50029E92896867A4E176FAEB2DCB99A3532EF4DE084CB1E96
-F4BE65BAD8F8C25AAAF3584932157FE9127A1D7835570CDA77B6F7D0229615B2
-AA21D3E3431778144B7EEEBB956B3595BAC07AB0D751FD62C9A6CECB950C3538
-BC6CD77C8533DDEC5C372AC27C6A2E9A79CCBE36864B8348ED91E9976785CBC4
-EF07FF48B49B29BF1206D7240DAC3A12F989DBB8CBE5F6FA91BC0EDEC04A2A7A
-9A6299785CB40219C27824F58C55BCF547FA8DEE5654A43DAC8280B440662928
-0D4E4DC6EEEE1F0C0E35E9228E96B4F573153BAA1D35CF53D894A74C51BB6E4A
-55E9B2FFB61F092B4F888065038B55D958BDEBE9598FA3DAD90E5709F0B0E0FF
-DE79BE14618CF79A8662E5568F18A3CBC6D09B68DF0FB332D46C40F590987A61
-5E393DB2AB0477C10C8480F0B9A867BF6A02F20351EC59B2DEB1FE00B2EC860D
-83E76D2CDF1F213F0497A12BB8AEF9CDC4D03EFFD0B8F3AA9D8ACDE4617960A2
-8EF4C506BE24F2A3B5CDE1B98368A88BDF59015F5349D81684340FC068D66765
-BB73373ECA89499B4F59A4927D2C570A2DFAB416448A04D8DB0A295AF120DA50
-30BE22C955705463FD41D6B601DFB5E620E8FB613286B36DEB36EC9490C2994E
-D5435DFC3F0F0F4745A98A60611C5193F1388CD48A18F3E721A524C3F88D1CE6
-373050987B34D4ED2DCD8DA4D8DB16D00A1F0CF4F8CFEBD149EFA78E737B7230
-AF131677ABFC07306CE38120F2953D76A84E39565DFB324E8A5A923914E5E054
-687503DED4E80DE9AA25A7DB3F77364C6F12C00BD8F11C49F08BA70308F9A4DC
-E509B0C1319FE1984FC01335AA5A0EC5E7309D2C1EC843575DFCE8B4C2375AEC
-C92184932876BAB2367A5B5DB41242F7B409EA9EAD239AD00A804EEEA0787FD3
-2E43FE0F363EC52E5A15897B6075A85548FBD06638730EC69F38F338639319C0
-89809A3CDCB60FF8A60208022DF3468FD483C0B5BA43F46C1D39B5B2CE9B85DF
-7A47299E90962361BE2D4AB7910FA184C2BC48AA3B20780D66B2B4EA0EDF5B05
-B6C48D4387773B6D67DF8A9A239475F84E70C0FB2D406020F48D1773913654F4
-45132D01525B3C7BB7AF17F19A8A039BE7F182C1EF0807E02CD76AA543A9E257
-E74BA7A4EF067A92BB470D39523E31F0FC152BCF85932F1C38DC41E67CF045C8
-9B4F7B909D35F1E602D3A3A229AD15F49F02342D7B0D3705679321E100A3407A
-95DAF5081DF7D98B53CB97C9D51AC86EC7CCAE3927BF6AA5BACA993455D27408
-5931BFC2ED2F6B06AE0627DD2B697AF0355B2594DCAB53003EBCC39F7BF0C3CB
-E299796249322787174180262E89DFED4E33DA5E5E6D60631BA92F43FED7E91D
-08408B588D5EA4D42129518881043CD91EA3D8AB42F255007995DC970D1419D7
-67156C21B76893B61FDF55BBA4CD1FA7B4B90AA3F1C64B42CD4BE8714D61B9F9
-D1CB7BE88BC050CED54CCE63B075542943E73E87C2B2EBB941F899184B19C59D
-931BAF7F53133948A9B4D302464486909D207BF5D135ECC528376E0FC7DB93DF
-849C6F29F1673CD08EEAA67C80EC193D80E9B3502716061AB96442A15E76DFD8
-3A7B74968EFF508B62C4A4C2360095A74F9D039C9A66E5F0BCBF0ACFF1D43B69
-FD50C16DD6ABAB1B320E5463089D771FD4DB65D66129E61F29786C8C249DC8A5
-758EEF3DE93CD763698AE76267C1EAB9A5AF224892D3F743DEB40374E8D6C02D
-1A7861E8531EB9918ED5FFF642293D93D41D08299EF196B58D5CD3A1BFAAA350
-A20D2111CFC616ADD3AFB71415FF98E30F5FFE957DEE5E9D803222C6C35D94BD
-40A43FB3F565B462D1A8039BD181106EA03C38E1EF81FEF3601203B9F26CA2A5
-BB2EAF08608A52C7C19EF2704F9131312EBFEDED137F7A79C99D1095FF85E470
-B0F79637B3A6F6C45E2589143C070403B2466EFBEABDBDE0895E50379D7D1052
-4F2FC50ABF9EF4BF4483FB93683426701669C3F5E28199B8C87D858D6B1B25FA
-D871DCF81CEAB71D3FB7AD2E1E2456A2792720EC91143FCF5B5DB15484E72F84
-FE2A10F5A726363A1F06362BB889E4FAD1A0AD2340E27C644B392A89D7D3484D
-73F96123AE36D03FFFFFE633BF015C145A0B25B98CA7D524160379DF43CE3C36
-673F45FAC8A8D63CD03717ECA647F6A3B23634E33BC43B79CB2EEE95CB7E9F01
-4184D7C6B634B9873B04C179D355D829B77A52FF118A9C16D854D4F2E83CF7EA
-1BD60244590A81536BD27FBBD5984B985BD6493D8CDEE4C84684A371CEB06102
-7E4D023F72BFE609D408AD65B4BA561365B2B355D5DA63482ED9807D20DD2427
-071139A2D1B1EDAC50899265FA12DDC0FF16568B460F6B3C526276D3966777EE
-C6C21E5BFA32145F42081FFF25C70B0AD3230087863840FA43005C337EAA3BE9
-AF577E52D58A351845C91366AC7198B22D0C6019F6C63CEB8109EEED7DA89B24
-D9559DBCD40A9825D40F65BF01E0A8804ADB6B145B9B94AEE12FFD31F57FCD5A
-1EA298C3BCBC1646F181516FFFD2FC43046B6BF503DEAF982B479315D5402E63
-8A02A7973465CFD2A7E1B17E20BCAF12B3B17676BC6BCB0DA42A5D339837B76B
-ED1B51449B8EE8807D330015006402877FEE9027A263A257C40322A9048803C5
-ABF417D357B4461A99AEEA9AF74755E140986FC19AEFB15AA42AAD4FE9ACB5B5
-358EE6B0F472FF26792FF63664B18307DC2E0E5BAABD1C9C2DCD0524085885D0
-E7F7F8B4FF423B47C7364D615F43FF2E5C3FF57A3662F47418B2B03CE8BC7B2B
-667A7F47C7A74E79FF634628D59569261A3A387B7B3FE7ED20E9D705EDE34756
-AEF02031C54E49C9D42A371738870E13B8137627218FD2703FA8FEB440CA4198
-F6A2A43CF219E144108B6CEDEECE86EFCE68A9BC1716B4712420298BA32C1453
-7E6D10684F386702583E55C3A94DB2388EE18EB35261AD61B08A7DA98AE9854C
-332A64BA203123AAD3576BE2C635DC60D6B49D116AD99B59FB8CD87AB171AAC9
-ADD81250ED29A7F1F96D3482BEA33964C4AC4719ABC0F647DF5F908E73153610
-0133582A1C79A2D9DB8D643A79CEFE77615806C61DFFFC84C007E3CBF716D4A7
-7D83C8A04F24D096BD77F013440938BF95EFEB58F9AC3839D78F65C86B2CBC32
-53F47E432207E4126D05AA29FF693722863F82130BF90474670D60915279F001
-23408B2F6D821D4DD6EEFA54470DCC72D00F0A67BECB0D1215C461529BC37D20
-FB10CB7342B3EEB935184FB18E309DCF4761F4F69BF29C900534C016B93745FD
-39F4B7A4B995597BE15E27ABE6E5A241EAC5F138251E38DADA82A3D2991AC97B
-FB5CFA577644F19D176BAD9E33429B14063A8EC1DD93643A9F47AE6F3F5E7F7D
-3B1B85C9EADFF3D1B9C015506DCED1166DBDDFBD25AF9A126A5FD97A3486AE49
-1D843BAD8865CF0123F45BE95B08141E270E448D4CC467A7FC3439686C0572E5
-2A9440B9680F6D0F4CF80A43447A4EF4DF2FDD399F3BFAEBD3DAC8B088DFDBE2
-58D27CAB82A1DBF2AECCD34307B873B6AAB6835BF678CC1C1B41E3C0249210D5
-0AF7DBEA28E57D520173E62D8CC1CE880211BB8A5AD7C7C7A9FA113B3D041845
-24E75396857842C00021719D0B458373D7E330036DD09EBA8BEC1CDC59726D59
-B42EEE1C45E26F90454973ACE698117140D912647F9B319651729A722C70E929
-F7D2B04709632AD5A599D0E1BAB38EFDA3BDCE499B01D36EBD12C83C4B3ED5B0
-0E4A2E88DEC143BE3D29A3BB4C833D4F660EA761CE84235CDFFC4A9E234CFE35
-9E1076EB2775DF5345F6A1BA1D40D76B79BD396ED1E83557B5F2FAED0196CE2C
-C7611C67C44879CE1012F2A5107FCAE7E1320A267156993D8D0D5940C3FA3AC6
-86488587BCAB96B544F57033A493E6B57A0CF5C72A94DADD111B56D6415FF06C
-D7B431EBBF62A745C5E547DA458F5F9A116C7A4C80CC6DBCDB687DEDD9FFCF04
-14B9AEBC57F35F59CEC7EAAD33BFEA3212118D133A71A5C06B665A85FA82E5A3
-0D505148263B59211572B1A3E2138969DB43F18138EE430AC2828566BB5AC27A
-BF7E8F06B7CFFBC51E8CB1A41DC1530F29DA63A98BB237E1DBAA8B2DB802F927
-2BEB6DD48DCAD7FA334A3257263855A70D72AE577EB6B3A3D7DBD03BC2FCE5A2
-390387FF25EDBD9BA335F92208AC2BE0AA6928B0986082F65D8541DA9EA536F4
-FA80888DC2C7D0B2E99221F8E5D2E662839363315AC6E2450010438D4D4F4292
-0E5E1CA07E95CF3D5387B7248CFAFFF26BE33F257377364620D7B25AD3F89046
-E733BF97F99C3F73D972934C3E49A591B990DA34D349AED34F536F67D226056B
-92A0297DD6D847F4FEBD58298A0A3F4098CB587C22B4A98FB853A5324E66974F
-DB075C4B0356D7DA6BA14D11F52250CBA270E51A9132FA75B83755070BC3E8AC
-CE3323F5930AD95B8C38722789C58FD2FB323DC4042F80220A7D6785FBA2F391
-78CD6E8DA8C5A6E73782B78412719F576767FC8FD32DB37A7A42188D67A0D11E
-18D51E9828ACD95C92070AF1E3BEFC32350FAA0477023C88B2722AC43CFC4678
-544264E96CA849ABC0B49B050AE29C18BD1F81B9150A965B51AAB408E1F8E275
-410E7779A6E30B867100662C6E387F681E2AC94DF450B163710C5A6AB2AB2F7A
-0E4E202A3F276AE9BB5685AEC43E0E9B24AACB6CF30DACC57CCB156A2FE5757F
-D5060CFC388FF0CDAD86B2F175A17F1E16012D7507B49EF5A694D6B285E7590C
-9278371F4FDE7DABBB21518DDF727117D06C8ED481024E3B54C9FE40B781881A
-7B7A9E2EB81DA0504CEB7F6CF8369932E8C258EA7916DFD51E49FD93E2D9922C
-FB2C2215B368E8FE85C2248C9593756C11AC52299404A93C2D2CF7E8E580FFFC
-817B83140261CB056F1B6AB7FEDDC7CF955C77D906B289AF67864931141F5DD8
-6B9009FB2248940C916FFF9F46791F00FB64D50866C790ECA8B242FB54AB3745
-FB3BBE5355FE7B899F4CB013D43F5236FAB1AF707BE2F7B0D8CF4897F885EFC6
-434CF862AA4F638B71E9345C5EC197599B7CD674ED6C1ACFDFE8C2C84D1829E7
-FA741F877C54EF07D95C735711AA314D50B51FE139907AA8748898E2610750B3
-9EE46B01902C530E798CD7A8675C51B782ECEA51A3F152B600E92D2DCC1E1137
-CBF2657B5ACE3C4919E82A2A486BBF07A73D115DDD8373AB72A8ABA000155A1E
-C02C7652E9D96EB87FAA286234F71A79197EAEC163AD6224FCEDCE51EAC4AB19
-1A775B623C4AC884B17575E6DDAF6AE55E64FA5C2F1CFDC3AD95B5B665C7C9F3
-82D20A58C6BFAD430C801F63B6C91709849FB4AA42F075A4D25D21F1D83C8391
-04C859D4F355BA56099653AF1D7F591C06423CB8BAC0EBB82E43AE0B7E061F7E
-F6E29D8EABE89DA4630501FE2378B642A171BFA6F6F4F647489CFE85C25C2AB4
-3F963F2E52AAEAE8368BCA11A0123D406F78AFE1FFB4B87537429AE2B1611D6D
-A8BAD3DBD8CADA2C66849D3E8BEC5CD6F0BA84304EB3F8D75EC1BC91383EAA57
-2363EC047B0ADC98B5DA2D44012C2367DA3A6D2B99C3323A0A6B15CCFF8B533D
-BC4C76F76940967781AB6D1AF8C5C0CD16619C0FC295158A597000517D6EA409
-EBDEC75A9D06293588D595D8A72136D3FB97B64D2ADC86CAB5474BB8FE548E9B
-DB41C23C4F5AD0655DD946774AD42213C7D49B45CC132F37CEEDF23E8D3B6FE7
-20589E789EAF0B5EFCAFCAA03A1B62A5BC96171C596FB110773FCFB0D990901D
-60E06DB0CBF1395F0E90191E27D944F83BDE324122C5F4824681F03FD8B3F8E6
-BC46A595722E9280577251C0E31C0E693FACD76E0A6A212D34E4A8069E5DAA3F
-13804E428A8CC22A51F754BF6B3D42DA997EC496492BEDD45C282EAB489A79D7
-2DE49123947BDCCA0C2DDCF8CE8781128E25289B9BC15D2F18F292A0E8B642F3
-D6F5B32DD53A5C578E9F39B2680F1CAB85A319B5F037710AB7968F1DCF08BE88
-5D2F8D1CDB27737332BE3520DE708B90481CFEB893BACCE3451FE5F3F6E734A3
-FD24BA5DB023A8BD03434BF30D9523C4CF7325E15D2A159B003B358057DCCEEF
-605C461466437F7A6286ADFE9AFFB9B13BF24489814551B2AA2760AA1AEFC2F2
-722B8BE418B704E7D785705CD22865304D060B216D506C07E1059B2DD14B5AAB
-D57A63B2957EAA3CDB10E48C37D66221BC05FFD7489DD7B6F19FB775AF6BA0A6
-CF5D12898D8C2A8EDDE1CCE54913EDF074ED1E35D7EF734BCF85D6C154F2DC90
-5478277243B3D7DC58674BB4608C95DDF7C8444C8B6AFD129541A6D9DF2A9903
-B4D251AC301ECF1042A857306EB3980BA89838253FA7644BA0CBFD4CC574CACB
-77E33D64445C0A4A64EFA36037EA854EDA52E903EE14C251B8D73D4BFAAB4FD6
-F2D24373DFEEF7173099659B9855785C10060E8E26F005337F64D253DE9E85E7
-662E9D4D68F1B027252DF51AF44DC0DD7E6F05994A792B3CBE26C2BCF66F64FF
-A752ECDFA0A802238C5DC3CA4AF92DA47E1A013D9F930437F677A55EC03EDB6C
-B57F0B26378F7887F4C54C520F0DA3ABDE09D74BE8A3DE2236F1C1EFABD69C0C
-D3EB0DA09BB16DD0376A0B77C3E28D2DD959BEF829B11EDAA1CF13C7F5F9BFB8
-1C231350208DD35DF45D7FCD20C242CAA437DD7E614E51E37BCFD47019D5608B
-95173A100A3701F25FF43125C2AB17E17352B3E41466F51693451A986CD2C642
-40EA04ABFA6BDFBFC31AB307FA726E033D613031AF06E4C6EA569192B99070A2
-5D82A614648F304920496ABEC8502ABF45C0CBD754CE7EC7D57060E03B384538
-BF894FCF7EA07E746A94AFB5CDA77FF669953C174966BC2652FABB40EE00AB25
-337A06AA440580F4F6DC7400BFEC6AC5C58D5C73E87AAF5040ED64B588053864
-432F749B68D6AF46C091114958859BDB75DEFDB2CFC048E1AABCA0FE28113B27
-957AB07CAFE27BEC706BC62948C484A9A5333E8A392326C88A55D973D95DCC70
-92CD97A8EA3D66CE661E4ABAFD6D83229ECF69EE50888F6BEF924D5D63CADD11
-C4D7A21DA0675EA2BF15C9C4DE84998D0B69F5686D4C9B73F085DE5CB431B7D7
-D137CCA6203197EF104B1FAE6B3B7B4B6664F2364E69B1A96D70CC1D817EE595
-54A50F7F0C46F29A20A0BB9E11DA2CFF991921357FB4BC5656B67BA91C5A8243
-6C907AF6C9614230BE133595F665F3ECA8E5E4CD6F9B2006D428EB3BE7DE3397
-E33AAFBE50E2F1E6FEB83FEB404BE3899043ACADEBFFC78CE883BF26D14D84E5
-DAA3D87223393403FE12BD1CF8E6C16EE61427F28841576EB4C112D236981C4B
-14A0B373C06015136FFCCEFA2B8ABCDF316265773A1FCE899A4E22D8245A7557
-46998F7D6FFD0BBF1AFCB7EFABE5403BC84CAC9EB3309B8966862B87415EA54A
-CB99F5AFBE5037B030B0DC196974895C9EB75A12D5EDACC83F3EE4258B448D2A
-167C4DF31B3546B0EAEEDCF31F61134DFC17A6063FCBE09FDA70F7CB8DF5C1F8
-09618DBB3B1FE9E33593AA2B9F4B0F5EEC9202C346B0F15C95D62D7914230F35
-42ACAE6ACE600DDF35F6CB1EC986B5763FC2CAFE50645CFA457AC1843A83B1B9
-45F2743ED899C19C931A852E56BF0BF69F0C433A9F9B45179654A65B4CE96CA9
-FA9F5037C967FCD6DE25880719BE90F58FBA561C3EC59DBFE3CA2A29E95A15AC
-EA30AB69593AD005809B105B28C5CD980E8744F48F8B1EDD24E699655ED26D84
-B5629040FAC51F9CFD85D6321453A4294F0C890EF6E9ED7AB312F521C04AC1FF
-950B02FE73C055BB10353DA73A25A6E38365B0DEF614B35507173F8D50508C07
-C3D07CA3382F12780D285F882BA433FF021A815380B3C0F16142BCFCB0BDFF7B
-E01DB4582A7DA86602F8A6712A346941164F113D2691FCB96DFCCEEC226C3052
-784B1DCD80E20584997B037F581E422829E964D0244CC122EFAE87AE71CB2F9E
-7DEA702C99C4FA29569650D150DD0895751A98C965E88764FEC259166FEE1E01
-2322B00834D35DF7500F95CA1A6230667CAF5C9DAD75C0236FE3F8DAED492D1A
-AC9A77FD054D15A8F421C67966E5285F8F1A5F3081832718324C1645160BAE46
-7631243A007DEA8E5EC0B31F59AEBD54213F3B113E2C11192A6202BF726C609E
-D7AB5FCE51A7BCFBEDC0953E78E669C27239380E74808EACEBE455152E0D20B3
-AD1521947D5035C0E1FEA838CE7A56C032275C12BC254934C49A519353E205CA
-116E2E4EAC45278BE0BC8BE3D0668E0A818AAE007661A73CFBFE968C60E5923C
-4D74BEA1587335CBB6770C6A319D0BB7F02DB3F01AC52ED574E006BC70E925D0
-97EBC2D8BBCA9E6719F26CFD5EA4BF25567B383C4627CC03490D9D1F95A18BC6
-7FEA0D5481CE6C856FCD37B8EF8FEAF0D3250CF4471ADEDC6073A5E003FD8602
-A890102EA5B9B94C845A4C3C77AED948C590E054B11B06DDFE55413E222308AC
-DA972DE63E749FC0FC0548A91FA786359585078B7870002C54E27F81E360E965
-EE71DDC73025CFDB4089ADE1B259C00D2E6125E4C46995C638CCC0B98FE00F23
-A61B9DF8D38DFAEA0E2194AA27C74A1221688937B4AE747FD597244B5DC8BB3C
-E8BC00BD0DE53D4A65DB275692F6BD0F99C7FFF99D5CA0394090A51EDBD8A75B
-87D35EB07733862636D9E13A5D7CBD3B22FCC97710D52D157D7E5083E49381F4
-8D91CA4331B070A7D90C41D235056947C21C186A9110F31970DA20D2172ECA80
-B9B01B7C965CEA77C1B4C939133425FD0DE08055EB456F71072A77420EFDADAD
-46E32BEEE986589FE9140678D83F1874B83D6F7C2D44CBF1A40B920A0FACEC2E
-82A4A92EF9D32895C8E97BE6A743C75BA0DE734E669B051BE4443A084D04E679
-49B13B564C6F8C26E09A7F3B1B36A80C4AB6486111DD6B8BE2A73D3D96E8477D
-FEF6703EC13578805F29F18D1AEFD56F4F6E6E786CE0636E87B7BBA3E49D58B1
-7F1DD67D7A514B14285BB3BB4CAFA2B493ED4A7990B413F8872EC4D06F43A07A
-F7580AEEE11315D01E5E4483B5923B13CC62935561D3AE18D91ED0BF62FFEA21
-CD6FA372F614E4B9FDDDF8159C291DA08A694D9A81C05DA69D2E15CDB29A8A87
-D8C95EE615FF831C3CCDBA64EDA6CE6E1DB95C062E0DC3B301DB5CA1A9AABB6E
-637D7DEF9E402CE90BAF65900FF480DBD9FE983FD3845737BB86DF197C087187
-657AAE6FF5F3091EFCBD689B
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-0000000000000000000000000000000000000000000000000000000000000000
-cleartomark
-%%EndFont 
 TeXDict begin 39139632 55387786 1000 600 600 (ru-refcard.dvi)
-@start /Fa 242[71 13[{}1 66.4176 /CMSY8 rf /Fb 15[39
-1[35 8[31 39 1[35 18[55 85[37 37 51 37 39 27 28 27 1[39
-35 39 59 20 37 1[20 39 35 22 31 39 31 39 35 11[53 1[39
-2[48 55 53 65 2[36 25 1[55 46 48 1[51 50 53 55 1[55 1[55
-5[35 35 1[35 35 35 35 1[20 24 20 44[{T2AEncoding ReEncodeFont}55
-66.4176 /SFRM0800 rf /Fc 197[23 58[{}1 83.022 /CMMI10
-rf /Fd 145[42 3[23 106[{}2 83.022 /CMSY10 rf /Fe 141[35
-3[47 5[42 38 3[38 1[42 97[{T2AEncoding ReEncodeFont}6
-83.022 /SFTI1000 rf /Ff 50 72 1[48 69 57 78 1[53 53 50
-74 50 45 42 53 53 48 53 64 53 53 53 53 42 80 44 53 41
-48 48 46 106[53 6[53 7[29 44 53 54[32 45[{T2AEncoding ReEncodeFont}36
-83.022 /SFBX1000 rf /Fg 130[44 44 44 44 44 44 44 44 44
-44 44 44 44 44 44 44 44 44 44 44 44 44 44 44 44 44 44
-44 44 44 44 1[44 44 44 3[44 2[44 44 44 1[44 2[44 44 4[44
-44 44 44 44 44 44 44 44 44 1[44 1[44 4[44 44 44 44 44
-44 44 44 44 44 44 44 44 44 44 1[44 44 44 44 44 11[44
-18[44 2[{T2AEncoding ReEncodeFont}75 83.022 /SFTT1000
-rf /Fh 69 2[66 95 1[108 108 73 73 69 102 69 62 58 73
-73 66 73 88 73 73 73 73 58 110 60 73 57 66 66 66 11[110
-99 91 95 90 103 1[103 125 1[103 1[103 80 4[93 93 77[52
-2[73 66 73 110 3[37 2[40 2[58 1[66 20[79 2[48 103 2[86
-11[66 66 66 66 66 66 66 66 66 66 3[37 2[51 51 40[{
-T2AEncoding ReEncodeFont}68 119.552 /SFBX1440 rf /Fi
-45 62 37 42 60 51 67 67 46 46 44 65 44 42 37 46 46 42
-46 55 46 46 46 46 37 69 37 46 37 42 42 42 14[60 1[65
-1[65 2[65 4[56 65 1[59 72[44 44 2[46 32 33 33 44 46 42
-1[69 23 2[23 1[42 25 37 46 37 1[42 8[62 2[62 6[62 76
-52 3[62 65 1[56 63 9[23 42 2[42 42 42 42 42 42 2[23 28
-23 2[32 32 18[42 3[28 28 16[{T2AEncoding ReEncodeFont}82
-83.022 /SFRM1000 rf end
+@start /Fa 242[71 13[{}1 66.4176 /CMSY8 rf
+%DVIPSBitmapFont: Fb larm0800 8 56
+/Fb 56 241 df<3C007E00FF00FF00FF80FF807F803D8001800180018003800300030007
+0006000E001C0038007000600009157A8714>44 D<FFFFC0FFFFC0FFFFC0FFFFC012047F
+9018>I<3C7EFFFFFFFF7E3C08087A8714>I<003FC00000FFF00003E07C0007C03E000F80
+1F000F000F001E0007801E0007803E0007C03E0007C07C0003E07C0003E07C0003E07C00
+03E07C0003E0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC00
+03F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F0FC0003F07C00
+03E07C0003E07C0003E07E0007E03E0007C03E0007C03E0007C01F000F800F000F000F80
+1F0007C03E0003F0FC0000FFF000003FC0001C2D7DAB23>48 D<000C00003C00007C0003
+FC00FFFC00FC7C00007C00007C00007C00007C00007C00007C00007C00007C00007C0000
+7C00007C00007C00007C00007C00007C00007C00007C00007C00007C00007C00007C0000
+7C00007C00007C00007C00007C00007C00007C00007C00007C00007C00007C00007C0000
+7C00007C0000FE007FFFFE7FFFFE172C7AAB23>I<007F800001FFF0000780FC000E003F
+001C001F8038000FC070000FC0600007E0F00007E0FC0007F0FE0007F0FE0003F0FE0003
+F0FE0003F07C0007F0000007F0000007F0000007E000000FE000000FC000001FC000001F
+8000003F0000007E0000007C000000F8000001F0000003E0000007C000000F8000001E00
+00003C00000078000000F0003000E0003001C0003003800060070000600E0000E01FFFFF
+E03FFFFFE07FFFFFC0FFFFFFC0FFFFFFC01C2C7DAB23>I<003FC00001FFF00007C0FC00
+0E007E001C003F001C001F803F001FC03F001FC03F800FC03F000FC03F000FC00C001FC0
+00001FC000001F8000001F8000003F0000003E0000007C000000F8000003F00000FFC000
+00FFF0000000FC0000003F0000001F8000001FC000000FC000000FE000000FE0000007F0
+000007F0380007F07C0007F0FE0007F0FE0007F0FE0007F0FE000FE0F8000FE060000FC0
+70001FC038001F801E003F000780FC0001FFF000007FC0001C2D7DAB23>I<0C0001800F
+C01F800FFFFF000FFFFE000FFFFC000FFFF0000FFFC0000C7E00000C0000000C0000000C
+0000000C0000000C0000000C0000000C0000000C0000000C1FC0000C7FF8000DE07C000F
+801F000F001F800E000F800C0007C0000007E0000007E0000003E0000003F0000003F000
+0003F0000003F0780003F0FC0003F0FC0003F0FC0003F0FC0003F0F80007E0E00007E060
+0007C070000FC038000F801C001F000E003E000780F80001FFE000007F80001C2D7DAB23
+>53 D<0003F800000FFE00003E078000F8018001F007C003E00FC007C00FC00F800FC00F
+800FC01F0007801F0000003E0000003E0000007E0000007E0000007C0000007C0FC000FC
+3FF000FCF07C00FDC01E00FF800F00FF000F80FF0007C0FE0007E0FE0007E0FE0003E0FC
+0003F0FC0003F0FC0003F0FC0003F07C0003F07C0003F07C0003F07E0003F07E0003F03E
+0003E03E0007E01E0007E01F0007C00F000F8007801F0003C03E0001E07C00007FF00000
+1FC0001C2D7DAB23>I<300000003C0000003FFFFFF83FFFFFF83FFFFFF07FFFFFF07FFF
+FFE0700001C06000018060000380C0000700C0000E00C0000C0000001C00000038000000
+3000000070000000E0000001C0000001C00000038000000380000007000000070000000F
+0000000E0000001E0000001E0000003E0000003E0000003E0000003C0000007C0000007C
+0000007C0000007C000000FC000000FC000000FC000000FC000000FC000000FC000000FC
+000000FC000000FC0000007800001D2E7CAC23>I<0000000000C00000000003C0000000
+000F00000000003C0000000000F00000000003C0000000000F00000000003C0000000000
+F00000000003C0000000001F00000000007C0000000001E0000000000780000000001E00
+00000000780000000001E0000000000780000000001E0000000000780000000000E00000
+0000007800000000001E000000000007800000000001E000000000007800000000001E00
+0000000007800000000001E000000000007C00000000001F000000000003C00000000000
+F000000000003C00000000000F000000000003C00000000000F000000000003C00000000
+000F000000000003C00000000000C02A297AA437>60 D<C00000000000F000000000003C
+00000000000F000000000003C00000000000F000000000003C00000000000F0000000000
+03C00000000000F000000000003E00000000000F800000000001E0000000000078000000
+00001E000000000007800000000001E000000000007800000000001E0000000000078000
+00000001C0000000000780000000001E0000000000780000000001E00000000007800000
+00001E0000000000780000000001E0000000000F80000000003E0000000000F000000000
+03C0000000000F00000000003C0000000000F00000000003C0000000000F00000000003C
+0000000000F00000000000C000000000002A297AA437>62 D<00003FF000000001FFFE00
+000007C00F8000001E0001E00000380000700000F000003C0001C000000E000380000007
+0007000000038006000FC001800E007FF001C01C01F03C00E01803E00E00603807C00700
+70300F80038030701F0001F838601F0001F818603E0000F818603E0000F818E03E0000F8
+1CC07C0000F80CC07C0000F80CC07C0000F80CC07C0000F80CC07C0000F80CC07C0000F8
+0CC07C0000F80CC07C0000F80CE03E0000F80C603E0000F80C603E0000F80C601F0001F8
+1C701F0001F818300F8003F8183807C007F8181803E00EF8381C01F03C7C700E007FF03F
+E006000FC00F8007000000000003800000000001C00000000000F00000003C0038000001
+FC001E00001FF00007C003FF800001FFFFF80000003FFE00002E307CAE37>64
+D<000001800000000003C00000000003C00000000003C00000000007E00000000007E000
+0000000FF0000000000FF0000000000FF0000000001BF80000000019F80000000019F800
+00000030FC0000000030FC0000000070FE00000000607E00000000607E00000000C03F00
+000000C03F00000000C03F00000001801F80000001801F80000003801FC0000003000FC0
+000003000FC00000060007E00000060007E00000060007E000000C0003F000000C0003F0
+00001FFFFFF800001FFFFFF80000180001F80000300000FC0000300000FC0000300000FC
+00006000007E00006000007E0000E000007F0000C000003F0000C000003F0001C000001F
+8003C000001F8007C000001FC00FF000003FE0FFFC0003FFFFFFFC0003FFFF302F7EAE35
+>I<FFFFFFFC0000FFFFFFFF800003F8000FC00001F80003F00001F80001F80001F80000
+FC0001F80000FE0001F800007E0001F800007F0001F800007F0001F800007F0001F80000
+7F0001F800007F0001F800007F0001F800007E0001F80000FE0001F80000FC0001F80001
+F80001F80003F00001F8000FE00001F8007F800001FFFFFF000001FFFFFFE00001F80003
+F00001F80001FC0001F80000FE0001F800007F0001F800003F0001F800003F8001F80000
+1F8001F800001FC001F800001FC001F800001FC001F800001FC001F800001FC001F80000
+1FC001F800001F8001F800003F8001F800003F0001F800007F0001F80000FE0001F80003
+FC0003F8000FF000FFFFFFFFC000FFFFFFFE00002A2D7DAC32>I<00001FF000C00000FF
+FE01C00003F00F83C0000F8001E3C0003F000077C0007C00003FC001F800001FC003F000
+000FC007E0000007C007E0000007C00FC0000003C01FC0000003C01F80000001C03F8000
+0001C03F00000001C07F00000000C07F00000000C07F00000000C0FE0000000000FE0000
+000000FE0000000000FE0000000000FE0000000000FE0000000000FE0000000000FE0000
+000000FE0000000000FE0000000000FE00000000007F00000000007F00000000C07F0000
+0000C03F00000000C03F80000000C01F80000001C01FC0000001800FC00000018007E000
+00038007E00000070003F00000060001F800000E00007C00001C00003F00007800000F80
+01E0000003F00FC0000000FFFE000000001FF000002A2F7CAD33>I<FFFFFFFFFC00FFFF
+FFFFFC0003F80003FC0001F800007C0001F800003E0001F800001E0001F800000E0001F8
+00000E0001F80000060001F80000060001F80000060001F80000070001F80000030001F8
+0030030001F80030030001F80030000001F80030000001F80030000001F80070000001F8
+0070000001F801F0000001FFFFF0000001FFFFF0000001F801F0000001F80070000001F8
+0070000001F80030000001F80030000001F8003000C001F8003000C001F8003000C001F8
+0000018001F80000018001F80000018001F80000018001F80000038001F80000030001F8
+0000070001F80000070001F800000F0001F800001F0001F800007F0003F80001FE00FFFF
+FFFFFE00FFFFFFFFFE002A2D7DAC30>69 D<FFFFFFFFFCFFFFFFFFFC03F80003FC01F800
+007C01F800003E01F800001E01F800000E01F800000E01F800000601F800000601F80000
+0601F800000701F800000301F800180301F800180301F800180001F800180001F8001800
+01F800380001F800780001F800F80001FFFFF80001FFFFF80001F800F80001F800780001
+F800380001F800180001F800180001F800180001F800180001F800180001F800000001F8
+00000001F800000001F800000001F800000001F800000001F800000001F800000001F800
+000001F800000001F800000003FC000000FFFFF80000FFFFF80000282D7EAC2E>I<0000
+1FF000C00000FFFE01C00003F00F83C0000F8001E3C0003F000077C0007C00003FC001F8
+00001FC003F000000FC007E0000007C007E0000007C00FC0000003C01FC0000003C01F80
+000001C03F80000001C03F00000001C07F00000000C07F00000000C07F00000000C0FE00
+00000000FE0000000000FE0000000000FE0000000000FE0000000000FE0000000000FE00
+00000000FE0000000000FE0000000000FE00001FFFFEFE00001FFFFE7F0000001FE07F00
+00000FC07F0000000FC03F0000000FC03F8000000FC01F8000000FC01FC000000FC00FC0
+00000FC007E000000FC007E000000FC003F000000FC001F800001FC0007C00001FC0003F
+00003FC0000F8000F3C00003F007C1C00000FFFF00C000001FF800002F2F7CAD37>I<FF
+FFF0FFFFF003FC0001F80001F80001F80001F80001F80001F80001F80001F80001F80001
+F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001
+F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001F80001
+F80001F80001F80001F80001F80001F80003FC00FFFFF0FFFFF0142D7EAC19>73
+D<007FFFF0007FFFF00000FF0000007E0000007E0000007E0000007E0000007E0000007E
+0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E
+0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E
+0000007E0000007E0000007E0000007E0000007E0000007E0000007E0038007E00FE007E
+00FE007E00FE007E00FE00FE00FE00FC007800FC007001F8003803F0001E07E00007FF80
+0001FC00001C2E7DAC24>I<FFF800000007FFC0FFFC0000000FFFC003FC0000000FF000
+01FC0000000FE00001BE0000001BE00001BE0000001BE000019F00000033E000019F0000
+0033E000019F00000033E000018F80000063E000018F80000063E0000187C00000C3E000
+0187C00000C3E0000183E0000183E0000183E0000183E0000183E0000183E0000181F000
+0303E0000181F0000303E0000180F8000603E0000180F8000603E0000180F8000603E000
+01807C000C03E00001807C000C03E00001803E001803E00001803E001803E00001803E00
+1803E00001801F003003E00001801F003003E00001800F806003E00001800F806003E000
+018007C0C003E000018007C0C003E000018007C0C003E000018003E18003E000018003E1
+8003E000018001F30003E000018001F30003E000018001F30003E000018000FE0003E000
+018000FE0003E0000180007C0003E00003C0007C0003E0000FF0007C0007F000FFFF0038
+01FFFFC0FFFF003801FFFFC03A2D7DAC41>77 D<FFF80003FFFCFFFC0003FFFC01FC0000
+3FC001FE00000F0001FF0000060001BF8000060001BF80000600019FC0000600018FE000
+06000187E00006000187F00006000183F80006000181F80006000181FC0006000180FE00
+060001807E00060001807F00060001803F80060001801FC0060001800FC0060001800FE0
+0600018007F00600018003F00600018003F80600018001FC0600018000FC0600018000FE
+06000180007F06000180003F86000180001F86000180001FC6000180000FE60001800007
+E60001800007F60001800003FE0001800001FE0001800001FE0001800000FE0001800000
+7E00018000003E00018000003E0003C000001E000FF000000E00FFFF00000E00FFFF0000
+06002E2D7DAC35>I<00003FF000000001FFFE00000007E01F8000001F8007E000003E00
+01F00000FC0000FC0001F800007E0003F000003F0007E000001F8007C000000F800FC000
+000FC01F80000007E01F80000007E03F00000003F03F00000003F07F00000003F87F0000
+0003F87E00000001F87E00000001F8FE00000001FCFE00000001FCFE00000001FCFE0000
+0001FCFE00000001FCFE00000001FCFE00000001FCFE00000001FCFE00000001FCFE0000
+0001FC7F00000003F87F00000003F87F00000003F83F00000003F03F80000007F01F8000
+0007E01F80000007E00FC000000FC00FE000001FC007E000001F8003F000003F0001F800
+007E0000FC0000FC00007E0001F800001F8007E0000007E01F80000001FFFE000000003F
+F000002E2F7CAD37>I<FFFFFFF800FFFFFFFF0003F8001FC001F80007E001F80001F001
+F80001F801F80000FC01F80000FE01F800007E01F800007F01F800007F01F800007F01F8
+00007F01F800007F01F800007F01F800007E01F80000FE01F80000FC01F80001F801F800
+01F001F80007E001F8001FC001FFFFFF0001FFFFF80001F800000001F800000001F80000
+0001F800000001F800000001F800000001F800000001F800000001F800000001F8000000
+01F800000001F800000001F800000001F800000001F800000001F800000001F800000001
+F800000003FC000000FFFFF00000FFFFF00000282D7DAC30>I<003F803001FFF07007C0
+7C700F000EF01E0007F03C0003F0780001F0780000F0700000F0F0000070F0000070F000
+0070F0000030F8000030F8000030FC0000007E0000007F0000003FE000003FFE00001FFF
+E0000FFFFC0007FFFF0001FFFF80003FFFE00003FFE000003FF0000007F8000001F80000
+00F8000000FC0000007CC000007CC000003CC000003CC000003CE000003CE000003CE000
+0078F0000078F8000070FC0000F0FE0001E0F78003C0E3F00F00E07FFE00C00FF0001E2F
+7CAD27>83 D<FFFFF003FFFCFFFFF003FFFC03FC00003FC001F800000F0001F800000600
+01F80000060001F80000060001F80000060001F80000060001F80000060001F800000600
+01F80000060001F80000060001F80000060001F80000060001F80000060001F800000600
+01F80000060001F80000060001F80000060001F80000060001F80000060001F800000600
+01F80000060001F80000060001F80000060001F80000060001F80000060001F800000600
+01F80000060001F80000060001F80000060001F80000060001F800000E0000F800000C00
+00FC00000C0000FC00001C00007C00001800007E00003800003F00007000001F00006000
+000F8001E0000007E00380000001F80F000000007FFC000000000FF000002E2E7DAC35>
+85 D<00FF000007FFC0000F01F0001C00F8003F007C003F003E003F003E003F003F001E
+001F0000001F0000001F0000001F0000001F000007FF00007FFF0001FE1F0007F01F001F
+C01F003F801F007F001F007E001F00FE001F06FC001F06FC001F06FC001F06FC003F06FE
+003F067E007F067F00EF8C1F83C7FC0FFF03F801FC01E01F207D9E23>97
+D<07C0000000FFC0000000FFC00000000FC000000007C000000007C000000007C0000000
+07C000000007C000000007C000000007C000000007C000000007C000000007C000000007
+C000000007C000000007C0FE000007C7FF800007CF03E00007DC01F00007F8007C0007F0
+007E0007E0003E0007C0001F0007C0001F8007C0001F8007C0000F8007C0000FC007C000
+0FC007C0000FC007C0000FC007C0000FC007C0000FC007C0000FC007C0000FC007C0000F
+C007C0001F8007C0001F8007C0001F0007C0003F0007E0003E0007F0007C0007B000F800
+07BC01F000070E07E0000607FF80000001FC0000222F7EAD27>I<001FE000007FFC0001
+F01E0003E0070007C01F800F801F801F001F803F001F803E000F007E0000007E0000007C
+000000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC
+0000007E0000007E0000007E0000C03F0000C01F0001C01F8001800FC0038007E0070001
+F03E00007FF800001FC0001A207E9E1F>I<000000F80000001FF80000001FF800000001
+F800000000F800000000F800000000F800000000F800000000F800000000F800000000F8
+00000000F800000000F800000000F800000000F800000000F800000FE0F800007FF8F800
+01F81EF80003E007F80007C003F8000F8001F8001F0001F8003F0000F8003E0000F8007E
+0000F8007E0000F800FC0000F800FC0000F800FC0000F800FC0000F800FC0000F800FC00
+00F800FC0000F800FC0000F800FC0000F8007C0000F8007E0000F8007E0000F8003E0001
+F8001F0001F8001F8003F8000F8007F80003E00EFC0001F03CFFC0007FF0FFC0001FC0F8
+00222F7EAD27>I<001F800000FFF00003E0780007C03E000F801E001F001F001F000F80
+3E000F807E0007807E0007C07C0007C0FC0007C0FC0007C0FC0007C0FFFFFFC0FFFFFFC0
+FC000000FC000000FC000000FC000000FC0000007E0000007E0000003E0000C03F0000C0
+1F0001C00F8003800FC0030003E00F0001F03C00007FF800001FC0001A207E9E1F>I<00
+03F0000FFC003E1E007C3F00F83F01F03F01F03F03E00C03E00003E00003E00003E00003
+E00003E00003E00003E00003E00003E000FFFFE0FFFFE003E00003E00003E00003E00003
+E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003
+E00003E00003E00003E00003E00003E00003E00003E00007F0007FFF807FFF80182F7FAE
+16>I<003F00F800FFC3FE03E1FF1E07807C1E0F807C0C1F003E001F003E003E001F003E
+001F003E001F003E001F003E001F003E001F003E001F001F003E001F003E000F807C0007
+8078000FE1F0000CFFC0001C3F00001C0000001C0000001C0000001E0000001F0000000F
+FFF8000FFFFF0007FFFFC00FFFFFF01E0007F83C0000F87800007CF800007CF000003CF0
+00003CF000003CF000003CF800007C7C0000F83E0001F01F0003E007E01F8001FFFE0000
+3FF0001F2D7E9D23>I<07C0000000FFC0000000FFC00000000FC000000007C000000007
+C000000007C000000007C000000007C000000007C000000007C000000007C000000007C0
+00000007C000000007C000000007C000000007C0FE000007C3FF800007C703E00007DE01
+F00007F801F00007F000F80007F000F80007E000F80007E000F80007C000F80007C000F8
+0007C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007C000F800
+07C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007
+C000F80007C000F8000FE001FC00FFFE1FFFC0FFFE1FFFC0222E7EAD27>I<07800FC01F
+E01FE01FE01FE00FC007800000000000000000000000000000000007C0FFC0FFC00FC007
+C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007
+C007C007C007C007C00FE0FFFCFFFC0E2E7EAD14>I<07C0000000FFC0000000FFC00000
+000FC000000007C000000007C000000007C000000007C000000007C000000007C0000000
+07C000000007C000000007C000000007C000000007C000000007C000000007C000000007
+C01FFE0007C01FFE0007C00FF00007C007C00007C007800007C00E000007C01C000007C0
+38000007C070000007C0E0000007C3C0000007C7C0000007CFE0000007DFF0000007F9F0
+000007F0F8000007E0FC000007C07E000007C03E000007C01F000007C01F800007C00FC0
+0007C007C00007C003E00007C003F00007C001F8000FE003FC00FFFE07FF80FFFE07FF80
+212E7EAD25>107 D<07C0FFC0FFC00FC007C007C007C007C007C007C007C007C007C007
+C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007C007
+C007C007C007C007C007C007C007C007C007C007C007C00FE0FFFEFFFE0F2E7EAD14>I<
+07C07F0007F000FFC3FFC03FFC00FFC783F0783F000FCE01F8E01F8007DC00F9C00F8007
+F800FF800FC007F0007F0007C007E0007E0007C007E0007E0007C007C0007C0007C007C0
+007C0007C007C0007C0007C007C0007C0007C007C0007C0007C007C0007C0007C007C000
+7C0007C007C0007C0007C007C0007C0007C007C0007C0007C007C0007C0007C007C0007C
+0007C007C0007C0007C007C0007C0007C007C0007C0007C007C0007C0007C007C0007C00
+07C007C0007C0007C00FE000FE000FE0FFFE0FFFE0FFFEFFFE0FFFE0FFFE371E7E9D3C>
+I<07C0FE0000FFC3FF8000FFC703E0000FDE01F00007F801F00007F000F80007F000F800
+07E000F80007E000F80007C000F80007C000F80007C000F80007C000F80007C000F80007
+C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007C0
+00F80007C000F80007C000F80007C000F80007C000F80007C000F8000FE001FC00FFFE1F
+FFC0FFFE1FFFC0221E7E9D27>I<001FE000007FF80001F03E0003C00F00078007800F00
+03C01F0003E03E0001F03E0001F07C0000F87C0000F87C0000F8FC0000FCFC0000FCFC00
+00FCFC0000FCFC0000FCFC0000FCFC0000FCFC0000FCFC0000FC7C0000F87C0000F83E00
+01F03E0001F01F0003E01F0003E00F8007C007C00F8001F03E00007FF800001FE0001E20
+7E9E23>I<07C0FE0000FFC7FF8000FFCF03E0000FDC01F00007F800FC0007F0007E0007
+E0003E0007C0003F0007C0001F8007C0001F8007C0001F8007C0000FC007C0000FC007C0
+000FC007C0000FC007C0000FC007C0000FC007C0000FC007C0000FC007C0001FC007C000
+1F8007C0001F8007C0003F0007C0003F0007E0007E0007F0007C0007F000F80007FC01F0
+0007CE07E00007C7FF800007C1FC000007C000000007C000000007C000000007C0000000
+07C000000007C000000007C000000007C000000007C00000000FE0000000FFFE000000FF
+FE000000222B7E9D27>I<0781F0FF87FCFF9E7E0F987E07B87E07B07E07F03C07E00007
+E00007E00007C00007C00007C00007C00007C00007C00007C00007C00007C00007C00007
+C00007C00007C00007C00007C00007C00007C0000FE000FFFF00FFFF00171E7E9D1B>
+114 D<01FE1807FFB81E01F83C00F8780078F00038F00038F00018F00018F80018FC0018
+FF00007FF0003FFF001FFFC00FFFF001FFF8001FFC0001FCC0007EC0003EC0003EE0001E
+E0001EF0001EF0001EF8003CF8003CFC0078FF01F0E3FFC0C0FF0017207E9E1C>I<0060
+0000600000600000600000E00000E00000E00001E00003E00003E00007E0001FE000FFFF
+F0FFFFF003E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003E0
+0003E00003E00003E00003E00003E01803E01803E01803E01803E01803E01803E01803E0
+3801F03001F07000F860003FE0000F80152A7FA81B>I<07C000F800FFC01FF800FFC01F
+F8000FC001F80007C000F80007C000F80007C000F80007C000F80007C000F80007C000F8
+0007C000F80007C000F80007C000F80007C000F80007C000F80007C000F80007C000F800
+07C000F80007C000F80007C000F80007C000F80007C000F80007C001F80007C001F80007
+C001F80007C003F80003E007F80003E00EFC0001F81CFFC0007FF8FFC0001FE0F800221F
+7E9D27>I<FFFC01FFC0FFFC01FFC00FE0007E0007E0007C0007E000380003E000300003
+E000700001F000600001F000600000F800C00000F800C00000F800C000007C018000007C
+018000003E030000003E030000003F070000001F060000001F060000000F8C0000000F8C
+0000000FDC00000007D800000007D800000003F000000003F000000003F000000001E000
+000001E000000000C00000221E7F9C25>I<FFFC3FFE07FFFFFC3FFE07FF0FE003F001F8
+0FC003E000F007C001E000E007C001F000E003E003F000C003E003F000C003E007F801C0
+01F00678018001F00678018001F80E7C038000F80C3C030000F80C3C0300007C181E0600
+007C181E0600007C181F0600003E300F0C00003E300F0C00003E300F8C00001F60079800
+001F60079800001F6007D800000FC003F000000FC003F000000FC003F00000078001E000
+00078001E00000078001E00000030000C000301E7F9C33>I<FFFC07FF80FFFC07FF800F
+F003FC0003F001F00001F001C00001F803800000F8030000007C060000003E0E0000001F
+1C0000001FB80000000FB000000007E000000003E000000001F000000003F800000007F8
+000000067C0000000C3E0000001C1F000000381F800000700F800000E007C00000E003E0
+0003C003F00007C001F8001FE003FC00FFF007FFC0FFF007FFC0221D7F9C25>I<FFFC01
+FFC0FFFC01FFC00FE0007E0007E0007C0007E000380003E000300003F000700001F00060
+0001F000600000F800C00000F800C00000FC01C000007C018000007E038000003E030000
+003E030000001F060000001F060000001F8E0000000F8C0000000F8C00000007D8000000
+07D800000003F000000003F000000003F000000001E000000001E000000000C000000000
+C0000000018000000001800000000380000000030000007803000000FC06000000FC0600
+0000FC0C000000FC1C000000783800000070700000003FE00000000F80000000222B7F9C
+25>I<FFFFFFFFFFFFFFFFFFFFFFFF03F800001FC001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800001F8001F800
+001F8003FC00003FC0FFFFF00FFFFFFFFFF00FFFFF302D7DAC37>207
+D<FFFFF800FFFFFF000FC01F8007C007E007C003E007C003F007C003F007C003F007C003
+F007C007E007C00FC007C03F8007FFFC0007FFFE0007C00F8007C003E007C001F007C000
+F807C000FC07C000FC07C000FC07C000FC07C000FC07C001F807C001F807C003F00FC00F
+E0FFFFFF80FFFFFE001E1D7E9C23>226 D<00FFFFFFE000FFFFFFE0000E007E00000E00
+7C000006007C000004007C00000C007C00000C007C00000C007C00000C007C00000C007C
+00000C007C00000C007C00000C007C00000C007C00000C007C000018007C000018007C00
+0018007C000030007C000030007C000070007C000060007C0000E0007C0001C0007C0003
+80007C000F00007E007FFFFFFFE07FFFFFFFE07C000003E078000001E070000000E06000
+000060E000000070E000000070C000000030C000000030C000000030C000000030C00000
+003024287F9C27>228 D<001F800000FFF00003E0780007C03E000F801E001F001F001F
+000F803E000F807E0007807E0007C07C0007C0FC0007C0FC0007C0FC0007C0FFFFFFC0FF
+FFFFC0FC000000FC000000FC000000FC000000FC0000007E0000007E0000003E0000C03F
+0000C01F0001C00F8003800FC0030003E00F0001F03C00007FF800001FC0001A207E9E1F
+>I<001FE000007FF80001F03E0003C00F00078007800F0003C01F0003E03E0001F03E00
+01F07C0000F87C0000F87C0000F8FC0000FCFC0000FCFC0000FCFC0000FCFC0000FCFC00
+00FCFC0000FCFC0000FCFC0000FC7C0000F87C0000F83E0001F03E0001F01F0003E01F00
+03E00F8007C007C00F8001F03E00007FF800001FE0001E207E9E23>238
+D<07C0FE0000FFC7FF8000FFCF03E0000FDC01F00007F800FC0007F0007E0007E0003E00
+07C0003F0007C0001F8007C0001F8007C0001F8007C0000FC007C0000FC007C0000FC007
+C0000FC007C0000FC007C0000FC007C0000FC007C0000FC007C0001FC007C0001F8007C0
+001F8007C0003F0007C0003F0007E0007E0007F0007C0007F000F80007FC01F00007CE07
+E00007C7FF800007C1FC000007C000000007C000000007C000000007C000000007C00000
+0007C000000007C000000007C000000007C00000000FE0000000FFFE000000FFFE000000
+222B7E9D27>240 D E
+%EndDVIPSBitmapFont
+/Fc 197[23 58[{}1 83.022 /CMMI10 rf /Fd 145[42 3[23 106[{}2
+83.022 /CMSY10 rf
+%DVIPSBitmapFont: Fe lati1000 10 6
+/Fe 6 115 df<0000F800000007FE0000001F871C00003E03FE00007C03FE0000F801FE
+0001F801FE0003F000FC0007E000FC000FE000FC000FC001FC001FC001F8001FC001F800
+3F8001F8003F8003F8007F8003F0007F0003F0007F0003F0007F0007F000FF0007E000FE
+0007E000FE0007E000FE000FE000FE000FC000FC000FC1C0FC000FC1C0FC001FC1C0FC00
+1F83C0FC001F8380FC003F8380FC003F87807C007F87007C00FF07003E01FF0F003E038F
+8E001F0F079E0007FE03FC0001F000F000222677A42A>97 D<00007F000003FFC0000FC1
+E0001F0070007E007800FC003801F801F803F003F807F003F807E003F80FE003F81FC003
+F01FC000003F8000003F8000007F8000007F0000007F0000007F000000FF000000FE0000
+00FE000000FE000000FE000000FC000000FC000000FC000000FC000030FC000038FC0000
+787C0000F07E0001E03E0003C03E000F801F003E000F81F80003FFE00000FF00001D2677
+A426>99 D<000007C00000003FF0000000FC38E00001F01FF00003E01FF00007C00FF000
+0F800FF0001F8007F0003F0007E0007F0007E0007E000FE000FE000FE000FC000FC001FC
+000FC001FC001FC003FC001FC003F8001F8003F8001F8003F8003F8007F8003F8007F000
+3F0007F0003F0007F0007F0007F0007F0007E0007E0007E0007E0007E000FE0007E000FE
+0007E000FC0003E001FC0003E003FC0003E007FC0001F00FF80000F01FF80000787BF800
+003FF3F800000FC3F000000003F000000007F000000007F000000007E000000007E00000
+000FE00000000FC0001C000FC0007E001FC0007E001F8000FE003F0000FE007E0000FE00
+FC00007801F800007C07E000001FFF80000003FE00000024367CA426>103
+D<0003F0000001FFF0000001FFF0000001FFF000000007F000000007E000000007E00000
+0007E00000000FE00000000FC00000000FC00000000FC00000001FC00000001F80000000
+1F800000001F800000003F800000003F000000003F000000003F000000007F000000007E
+07F000007E1FFC00007E783E0000FFE01F0000FFC01F8000FF800F8000FF000F8001FE00
+0F8001FE000FC001FC000FC001F8001F8003F8001F8003F0001F8003F0001F8003F0003F
+8007F0003F0007E0003F0007E0003F0007E0007F000FE0007E000FC0007E000FC000FE00
+0FC000FC001FC000FC001F8001FC1C1F8001F81C1F8001F83C3F8003F8383F0003F0383F
+0003F0383F0003F0707F0003E0707E0003E0F07E0003E0E07E0003E1C0FE0001E380FC00
+00FF003800003C00263B7BB92A>I<01E000FE000007F803FF80000E3C0F07C0001E3E3C
+03E0001C1F7803F000383FF001F000383FE001F000783FC001F000703FC001F800703F80
+01F800703F0003F000F07F0003F000E07E0003F000E07E0003F000007E0007F00000FE00
+07E00000FC0007E00000FC0007E00000FC000FE00001FC000FC00001F8000FC00001F800
+1FC00001F8001F800003F8001F800003F0003F838003F0003F038003F0003F078007F000
+7F070007E0007E070007E0007E070007E0007E0E000FE0007C0E000FC0007C1E000FC000
+7C1C000FC0007C38001FC0003C78001F80001FE000070000078000292679A42F>110
+D<03C003F0000FF01FFC001E783C0F001C7C700F003C3EE03F80383FC03F80387F803F80
+787F803F00707F003F00707F001C00F07E000000E0FE000000E0FC000000E0FC00000000
+FC00000001FC00000001F800000001F800000001F800000003F800000003F000000003F0
+00000003F000000007F000000007E000000007E000000007E00000000FE00000000FC000
+00000FC00000000FC00000001FC00000001F800000001F800000001F800000003F800000
+003F000000000E00000000212679A423>114 D E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Ff labx1000 10 36
+/Ff 36 256 df<FFFFFF80FFFFFF80FFFFFF80FFFFFF80FFFFFF80FFFFFF80FFFFFF80FF
+FFFF8019087F9620>45 D<000000007F800000007FFF800000007FFF800000007FFF8000
+00007FFF8000000003FF8000000001FF8000000001FF8000000001FF8000000001FF8000
+000001FF8000000001FF8000000001FF8000000001FF8000000001FF8000000001FF8000
+000001FF8000000001FF8000000001FF8000000001FF8000000001FF800001FF81FF8000
+0FFFF1FF80003FFFFDFF8000FFC07FFF8003FF001FFF8007FC0007FF800FFC0003FF801F
+F80001FF801FF00001FF803FF00001FF803FF00001FF807FE00001FF807FE00001FF807F
+E00001FF80FFE00001FF80FFE00001FF80FFE00001FF80FFE00001FF80FFE00001FF80FF
+E00001FF80FFE00001FF80FFE00001FF80FFE00001FF80FFE00001FF807FE00001FF807F
+E00001FF807FF00001FF803FF00001FF803FF00001FF801FF80003FF800FF80007FF8007
+FC000FFF8003FE001FFFC001FF80FDFFFE007FFFF9FFFE001FFFE1FFFE0001FF01FFFE2F
+3A7DB935>100 D<0003FF8000001FFFF000007FFFFC0001FF83FE0003FE007F8007FC00
+3F800FF8003FC01FF8001FE01FF0001FE03FF0000FF03FF0000FF07FE0000FF07FE0000F
+F87FE00007F8FFE00007F8FFE00007F8FFFFFFFFF8FFFFFFFFF8FFFFFFFFF8FFE0000000
+FFE0000000FFE0000000FFE00000007FE00000007FE00000007FE00000003FF00000003F
+F00000781FF00000780FF80000F80FFC0000F007FC0003F001FF000FE000FFC07FC0007F
+FFFF00000FFFFC000001FFE00025257DA42C>I<00001FF0000001FFFC000007FFFF0000
+1FF87F80003FE0FF8000FFC1FFC000FFC1FFC001FF81FFC001FF81FFC003FF01FFC003FF
+00FF8003FF00FF8003FF003E0003FF00000003FF00000003FF00000003FF00000003FF00
+000003FF00000003FF00000003FF000000FFFFFF0000FFFFFF0000FFFFFF0000FFFFFF00
+0003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF000000
+03FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003
+FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF
+00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00
+0000FFFFFE0000FFFFFE0000FFFFFE0000FFFFFE0000223A7DB91D>I<00FE007FC000FF
+FE03FFF800FFFE0FFFFE00FFFE1F03FF00FFFE3C01FF8007FE7801FF8003FEF000FF8003
+FFE000FFC003FFC000FFC003FFC000FFC003FF8000FFC003FF8000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC0FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF30
+257DA435>110 D<00FF00003FC0FFFF003FFFC0FFFF003FFFC0FFFF003FFFC0FFFF003F
+FFC007FF0001FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000
+FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000
+FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000
+FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0001FFC003FF0001
+FFC003FF0003FFC003FF0003FFC001FF0007FFC001FF800FFFE000FFC03EFFFF007FFFFC
+FFFF001FFFF0FFFF0003FF80FFFF30257DA435>117 D<003FFE00000003FFFFE000000F
+FFFFF800001FF00FFE00003FF003FF00003FF801FF80003FF800FFC0003FF800FFC0003F
+F8007FE0003FF8007FE0001FF0007FE0000FE0007FE0000380007FE0000000007FE00000
+00007FE00000003FFFE000000FFFFFE000007FFFFFE00001FFF87FE00007FF807FE0000F
+FE007FE0003FF8007FE0003FF0007FE0007FE0007FE000FFE0007FE000FFC0007FE000FF
+C0007FE000FFC0007FE000FFC0007FE000FFC000FFE000FFE001FFE0007FE001FFE0003F
+F007FFF8001FFC1FBFFFC00FFFFE1FFFC003FFF80FFFC0003FE003FFC02A257DA42E>
+224 D<000000003E0000000003FE00000001FFFE0000007FFFFE000007FFFFFE00001FFF
+FFFC00007FFFFFFC0001FFFFFFF80003FFFFFFF00007FFFFFFC0000FFFFFF800000FFFC0
+0000001FFC000000001FF0000000003FE0000000003FC0000000003F80000000003F0000
+0000007E00000000007E00000000007C00000000007C01FFC000007C0FFFF80000787FFF
+FF0000F8FF80FF8000FBFE003FE000FFFC001FF000FFF8000FF800FFF00007FC00FFF000
+07FC00FFF00007FE00FFE00003FE00FFE00003FF00FFE00003FF00FFE00003FF00FFE000
+03FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE000
+03FF80FFE00003FF80FFE00003FF807FE00003FF007FE00003FF007FE00003FF003FE000
+03FE003FF00007FE001FF00007FC001FF00007FC000FF8000FF80007FC001FF00003FE00
+3FE00001FF80FFC000007FFFFF0000001FFFFC00000001FFC00000293A7DB930>I<FFFF
+FFFC0000FFFFFFFFC000FFFFFFFFF00003FF001FF80003FF000FFC0003FF0007FE0003FF
+0007FE0003FF0003FF0003FF0003FF0003FF0003FF0003FF0003FF0003FF0007FE0003FF
+0007FE0003FF001FFC0003FF007FF00003FFFFFFC00003FFFFFF000003FFFFFFE00003FF
+000FF80003FF0007FC0003FF0003FE0003FF0001FF0003FF0001FF8003FF0001FFC003FF
+0001FFC003FF0001FFC003FF0001FFC003FF0001FFC003FF0001FFC003FF0001FF8003FF
+0003FF8003FF0003FF0003FF0007FE0003FF001FFC00FFFFFFFFF800FFFFFFFFE000FFFF
+FFFF00002A257EA430>I<FFFFFFFFE0FFFFFFFFE0FFFFFFFFE003FF003FE003FF000FE0
+03FF0007E003FF0003E003FF0001E003FF0001F003FF0001F003FF0000F003FF0000F003
+FF0000F003FF0000F003FF0000F003FF00000003FF00000003FF00000003FF00000003FF
+00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00
+000003FF00000003FF00000003FF00000003FF00000003FF00000003FF00000003FF0000
+00FFFFFE0000FFFFFE0000FFFFFE000024257EA429>I<000FFFFFFFFFC0000FFFFFFFFF
+C0000FFFFFFFFFC000007C003FF000000078003FF000000078003FF000000078003FF000
+000078003FF000000078003FF000000078003FF000000078003FF000000078003FF00000
+0078003FF000000078003FF000000078003FF000000070003FF000000070003FF0000000
+F0003FF0000000F0003FF0000000F0003FF0000000E0003FF0000001E0003FF0000001E0
+003FF0000001C0003FF0000003C0003FF0000003C0003FF000000780003FF00000078000
+3FF000000F00003FF000001F00003FF000003E00003FF000007C00003FF00000F800003F
+F00001F000003FF0007FFFFFFFFFFFE07FFFFFFFFFFFE07FFFFFFFFFFFE07FE00000007F
+E07F000000000FE07E0000000007E07C0000000003E07C0000000003E0F80000000001F0
+F80000000001F0F80000000001F0F00000000000F0F00000000000F0F00000000000F0F0
+0000000000F0F00000000000F0343280A435>I<0003FF8000001FFFF000007FFFFC0001
+FF83FE0003FE007F8007FC003F800FF8003FC01FF8001FE01FF0001FE03FF0000FF03FF0
+000FF07FE0000FF07FE0000FF87FE00007F8FFE00007F8FFE00007F8FFFFFFFFF8FFFFFF
+FFF8FFFFFFFFF8FFE0000000FFE0000000FFE0000000FFE00000007FE00000007FE00000
+007FE00000003FF00000003FF00000781FF00000780FF80000F80FFC0000F007FC0003F0
+01FF000FE000FFC07FC0007FFFFF00000FFFFC000001FFE00025257DA42C>I<3FFF003F
+FFFF003FFF003FFF003FFFFF003FFF003FFF003FFFFF003FFF0003FE0000FFC0001FF000
+00FE0000FFC0001FC000007F0000FFC0003F8000001FC000FFC000FE0000000FE000FFC0
+01FC00000007F000FFC003F800000001FC00FFC00FE000000000FE00FFC01FC000000000
+3F00FFC03F00000000001FC0FFC0FE00000000000FE0FFC1FC00000000000FF0FFC3FC00
+000000000FFCFFCFFC00000000001FFEFFDFFE00000000003FFFFFFFFF00000000007FFF
+FFFFFF8000000000FFEFFFFDFFC000000001FFE3FFF1FFE000000003FFC1FFE0FFF00000
+0003FF80FFC07FF000000007FF00FFC03FF80000000FFE00FFC01FFC0000001FFC00FFC0
+0FFE0000003FF800FFC007FF0000007FF800FFC007FF8000007FF000FFC003FF800000FF
+E000FFC001FFC00001FFC000FFC000FFE00003FF8000FFC0007FF00007FF0000FFC0003F
+F8000FFF0000FFC0003FFC00FFFFE03FFFFF01FFFFC0FFFFE03FFFFF01FFFFC0FFFFE03F
+FFFF01FFFFC04A257EA44F>I<701FFF00007CFFFFF0007FFFFFFE007FE00FFF007F8001
+FF807F0000FFC07E0000FFC07C00007FE07C00007FE07800007FE07800007FE0000000FF
+C0000001FFC0000003FF0000000FFE00003FFFF800003FFFC000003FFFF80000000FFE00
+000003FF80000000FFC0000000FFC00000007FE00000007FF00000007FF00000007FF000
+00007FF0F000007FF0F800007FF07800007FE0780000FFE07C0000FFC03E0003FF801FC0
+0FFF000FFFFFFC0003FFFFF000007FFF000024257EA42A>I<FFFFFC3FFFFFFFFFFC3FFF
+FFFFFFFC3FFFFF03FF0000FFC003FF0000FFC003FF0001FFC003FF0003FFC003FF0003FF
+C003FF0007FFC003FF000FFFC003FF001FFFC003FF001EFFC003FF003CFFC003FF007CFF
+C003FF0078FFC003FF00F0FFC003FF01E0FFC003FF01E0FFC003FF03C0FFC003FF0780FF
+C003FF0780FFC003FF0F00FFC003FF1E00FFC003FF3E00FFC003FF3C00FFC003FF7800FF
+C003FFF800FFC003FFF000FFC003FFE000FFC003FFC000FFC003FFC000FFC003FF8000FF
+C003FF0000FFC003FF0000FFC0FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF30257EA435
+>I<000F8001F000001FE007F800003FF00FFC00007FF00FFE00007FF81FFE00007FF81F
+FE00007FF81FFE00007FF81FFE00007FF00FFE00003FF00FFC00003FE007FC00001FC003
+F800000FFFFFF0000003FFFFC0000000FFFF000000001FF8000000000000000000000000
+0000000000000000000000000000FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF03FF0000
+FFC003FF0000FFC003FF0001FFC003FF0003FFC003FF0003FFC003FF0007FFC003FF000F
+FFC003FF001FFFC003FF001EFFC003FF003CFFC003FF007CFFC003FF0078FFC003FF00F0
+FFC003FF01E0FFC003FF01E0FFC003FF03C0FFC003FF0780FFC003FF0780FFC003FF0F00
+FFC003FF1E00FFC003FF3E00FFC003FF3C00FFC003FF7800FFC003FFF800FFC003FFF000
+FFC003FFE000FFC003FFC000FFC003FFC000FFC003FF8000FFC003FF0000FFC003FF0000
+FFC0FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF30397EB835>I<FFFFFC00FFFCFFFFFC
+00FFFCFFFFFC00FFFC03FF00007FC003FF00007F0003FF0000FE0003FF0003F80003FF00
+07F00003FF000FE00003FF003F800003FF007F000003FF00FC000003FF03F8000003FF07
+F0000003FF0FF0000003FF3FF0000003FF7FF8000003FFFFFC000003FFFFFE000003FFF7
+FF000003FFC7FF800003FF83FFC00003FF01FFC00003FF00FFE00003FF007FF00003FF00
+3FF80003FF001FFC0003FF001FFE0003FF000FFE0003FF0007FF0003FF0003FF8003FF00
+01FFC003FF0000FFE003FF0000FFF0FFFFFC07FFFFFFFFFC07FFFFFFFFFC07FFFF30257E
+A435>I<001FFFFFFFFF80001FFFFFFFFF80001FFFFFFFFF800000F8007FE0000000F000
+7FE0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007F
+E0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0
+000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE000
+0000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0000000F0007FE0001E
+01F0007FE0003F01F0007FE0007F81E0007FE000FFC1E0007FE000FFC3E0007FE000FFC3
+E0007FE000FFC7C0007FE000FF8FC0007FE0007FFF80007FE0003FFF001FFFFF801FFE00
+1FFFFF800FF8001FFFFF8031257FA435>I<FFFF8000007FFF80FFFFC00000FFFF80FFFF
+C00001FFFF8003FFE00001FFE00003FFE00001FFE00003FFE00003BFE00003DFF00003BF
+E00003DFF000073FE00003CFF800073FE00003CFF8000E3FE00003C7FC000E3FE00003C7
+FC001C3FE00003C7FC001C3FE00003C3FE001C3FE00003C3FE00383FE00003C1FF00383F
+E00003C1FF00703FE00003C0FF80703FE00003C0FF80E03FE00003C07FC0E03FE00003C0
+7FC1C03FE00003C07FC1C03FE00003C03FE1C03FE00003C03FE3803FE00003C01FF3803F
+E00003C01FF7003FE00003C00FFF003FE00003C00FFE003FE00003C007FE003FE00003C0
+07FE003FE00003C007FC003FE00003C003FC003FE00003C003F8003FE00007E001F8003F
+E000FFFF01F00FFFFF80FFFF00F00FFFFF80FFFF00E00FFFFF8039257DA440>I<FFFFFC
+3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF03FF0000FFC003FF0000FFC003FF0000FFC003FF00
+00FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF00
+00FFC003FF0000FFC003FF0000FFC003FFFFFFFFC003FFFFFFFFC003FFFFFFFFC003FF00
+00FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF00
+00FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF00
+00FFC003FF0000FFC003FF0000FFC003FF0000FFC0FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC
+3FFFFF30257EA435>I<0001FFC00000000FFFF80000007FFFFF000000FF80FF800003FE
+003FE00007FC001FF0000FF8000FF8001FF00007FC001FF00007FC003FF00007FE003FE0
+0003FE007FE00003FF007FE00003FF007FE00003FF00FFE00003FF80FFE00003FF80FFE0
+0003FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE00003FF80FFE0
+0003FF807FE00003FF007FE00003FF007FE00003FF003FE00003FE003FF00007FE001FF0
+0007FC001FF00007FC000FF8000FF80007FC001FF00003FE003FE00001FF80FFC000007F
+FFFF0000001FFFFC00000001FFC0000029257DA430>I<FFFFFFFFFFFFFFFFFFFFFFFFFF
+FFFFFFFFFF03FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003
+FF0000FFC003FF0000FFC0FFFFFC3FFFFFFFFFFC3FFFFFFFFFFC3FFFFF30257EA435>I<
+00FF01FF8000FFFF0FFFF000FFFF3FFFFC00FFFFFE07FF00FFFFF001FF8003FFE000FFC0
+03FF80007FE003FF00007FF003FF00003FF803FF00003FF803FF00001FFC03FF00001FFC
+03FF00001FFC03FF00000FFE03FF00000FFE03FF00000FFE03FF00000FFE03FF00000FFE
+03FF00000FFE03FF00000FFE03FF00000FFE03FF00000FFE03FF00000FFE03FF00000FFC
+03FF00001FFC03FF00001FFC03FF00001FF803FF00003FF803FF00003FF003FF80007FF0
+03FFC0007FE003FFE000FFC003FFF003FF8003FFFC07FE0003FF3FFFF80003FF0FFFE000
+03FF03FF000003FF0000000003FF0000000003FF0000000003FF0000000003FF00000000
+03FF0000000003FF0000000003FF0000000003FF0000000003FF0000000003FF00000000
+03FF00000000FFFFFC000000FFFFFC000000FFFFFC000000FFFFFC0000002F357EA435>
+I<0001FFC000000FFFFC00007FFFFF0000FF80FF8003FE00FFC007FC01FFC00FF801FFC0
+1FF801FFC01FF001FFC03FF001FFC03FF000FF807FE0007F007FE0001C007FE0000000FF
+E0000000FFE0000000FFE0000000FFE0000000FFE0000000FFE0000000FFE0000000FFE0
+000000FFE00000007FE00000007FE00000007FF00000003FF00000003FF00001E01FF800
+01E01FF80003E00FFC0007C007FE00078003FF001F8000FFC07E00007FFFFC00000FFFF0
+000001FF800023257DA42A>I<7FFFFFFFFE7FFFFFFFFE7FFFFFFFFE7F81FF81FE7E01FF
+807E7C01FF803E7801FF801E7801FF801EF801FF801FF801FF801FF001FF800FF001FF80
+0FF001FF800FF001FF800FF001FF800F0001FF80000001FF80000001FF80000001FF8000
+0001FF80000001FF80000001FF80000001FF80000001FF80000001FF80000001FF800000
+01FF80000001FF80000001FF80000001FF80000001FF80000001FF80000001FF80000001
+FF800001FFFFFF8001FFFFFF8001FFFFFF8028257EA42D>I<FFFFF001FFF8FFFFF001FF
+F8FFFFF001FFF807FF00003F8003FF00001F0003FF00001E0003FF80003E0001FF80003C
+0001FFC0007C0000FFC000780000FFE000F800007FE000F000007FF001F000003FF001E0
+00003FF801E000001FF803C000001FF803C000001FFC07C000000FFC078000000FFE0F80
+000007FE0F00000007FF1F00000003FF1E00000003FFBE00000001FFBC00000001FFFC00
+000000FFF800000000FFF800000000FFF8000000007FF0000000007FF0000000003FE000
+0000003FE0000000001FC0000000001FC0000000000F80000000000F80000000000F0000
+0000000F00000000001F00000000001E0000003F003E0000007F803C000000FFC07C0000
+00FFC078000000FFC0F8000000FFC1F0000000FFC3E00000007F87C00000007D1F800000
+003FFF000000001FFC0000000007F0000000002D357EA432>I<00000001FE0000000000
+0001FFFE00000000000001FFFE00000000000001FFFE00000000000001FFFE0000000000
+00000FFE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+00FF87FE1FF00000000FFFE7FE7FFF0000003FFFFFFFFFFFC00000FFE07FFFE07FF00003
+FF801FFF801FFC0007FF000FFF000FFE000FFE0007FE0007FF001FFC0007FE0003FF801F
+F80007FE0001FF803FF80007FE0001FFC03FF00007FE0000FFC07FF00007FE0000FFE07F
+F00007FE0000FFE07FF00007FE0000FFE0FFE00007FE00007FF0FFE00007FE00007FF0FF
+E00007FE00007FF0FFE00007FE00007FF0FFE00007FE00007FF0FFE00007FE00007FF0FF
+E00007FE00007FF0FFE00007FE00007FF0FFE00007FE00007FF07FF00007FE0000FFE07F
+F00007FE0000FFE07FF00007FE0000FFE03FF00007FE0000FFC03FF80007FE0001FFC01F
+F80007FE0001FF801FFC0007FE0003FF800FFE000FFF0007FF0007FF000FFF000FFE0003
+FF801FFF801FFC0000FFE07FFFE07FF000003FFFFFFFFFFFC000000FFFE7FE7FFF000000
+00FF87FE1FF0000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE0000000000000007FE0000000000000007FE0000000000000007FE0000000000
+000007FE00000000000001FFFFF8000000000001FFFFF8000000000001FFFFF800000000
+0001FFFFF8000000444A7DB94B>I<FFFFF01FFFF0FFFFF01FFFF0FFFFF01FFFF007FF00
+03FE0003FF8001F00001FFC003E00000FFC007E000007FE007C000003FF00F8000003FF8
+1F0000001FFC3E0000000FFC7C00000007FEFC00000003FFF800000003FFF000000001FF
+E000000000FFC0000000007FE0000000003FF0000000003FF8000000007FFC000000007F
+FC00000000FFFE00000001F3FF00000003E3FF80000007C1FFC000000FC0FFC000001F80
+7FE000001F003FF000003E003FF800007C001FFC0000F8000FFC0001F80007FE0007FC00
+07FF00FFFF003FFFF8FFFF003FFFF8FFFF003FFFF82D257EA432>I<FFFFFC3FFFFF00FF
+FFFC3FFFFF00FFFFFC3FFFFF0003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF
+0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF00
+00FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000
+FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FF
+C00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC0
+0003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC00003FF0000FFC000
+03FF0000FFC00003FF0000FFC000FFFFFFFFFFFF80FFFFFFFFFFFF80FFFFFFFFFFFF8000
+00000001FF8000000000003F8000000000001F8000000000000F8000000000000F800000
+00000007C0000000000007C0000000000007C0000000000003C0000000000003C0000000
+000003C0000000000003C0000000000003C032327EA435>I<FFFFFC3FFFFFFFFFFC3FFF
+FFFFFFFC3FFFFF03FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FF
+C003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FFC003FF0000FF
+C003FF0000FFC003FF0000FFC001FF8001FFC000FF800FFFC0007FC07FFFC0003FFFFEFF
+C0000FFFF0FFC00001FF80FFC000000000FFC000000000FFC000000000FFC000000000FF
+C000000000FFC000000000FFC000000000FFC000000000FFC000000000FFC000000000FF
+C000000000FFC000000000FFC00000003FFFFF0000003FFFFF0000003FFFFF30257EA435
+>I<FFFFFC3FFFFF0FFFFFC0FFFFFC3FFFFF0FFFFFC0FFFFFC3FFFFF0FFFFFC003FF0000
+FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF000
+03FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0
+003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF
+0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003F
+F00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000
+FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF000
+03FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0
+003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF0000FFC0003FF00003FF
+0000FFC0003FF00003FF0000FFC0003FF000FFFFFFFFFFFFFFFFFFE0FFFFFFFFFFFFFFFF
+FFE0FFFFFFFFFFFFFFFFFFE000000000000000007FE000000000000000000FE000000000
+0000000007E0000000000000000003E0000000000000000003E0000000000000000001F0
+000000000000000001F0000000000000000001F0000000000000000000F0000000000000
+000000F0000000000000000000F0000000000000000000F0000000000000000000F04C32
+7EA44F>249 D<7FFFFFF00000007FFFFFF00000007FFFFFF00000007F81FF800000007E
+01FF800000007C01FF800000007801FF800000007801FF80000000F801FF80000000F801
+FF80000000F001FF80000000F001FF80000000F001FF80000000F001FF80000000F001FF
+800000000001FFFFFF00000001FFFFFFF0000001FFFFFFFC000001FF801FFE000001FF80
+07FF000001FF8003FF800001FF8001FFC00001FF8001FFC00001FF8000FFE00001FF8000
+FFE00001FF8000FFE00001FF8000FFE00001FF8000FFE00001FF8000FFE00001FF8001FF
+C00001FF8001FFC00001FF8003FF800001FF8007FF000001FF801FFE00007FFFFFFFFC00
+007FFFFFFFF000007FFFFFFF000033257EA439>I<FFFFFC00003FFFFFFFFFFC00003FFF
+FFFFFFFC00003FFFFF03FF00000000FFC003FF00000000FFC003FF00000000FFC003FF00
+000000FFC003FF00000000FFC003FF00000000FFC003FF00000000FFC003FF00000000FF
+C003FF00000000FFC003FF00000000FFC003FF00000000FFC003FF00000000FFC003FFFF
+FE0000FFC003FFFFFFE000FFC003FFFFFFF800FFC003FF003FFC00FFC003FF000FFE00FF
+C003FF0007FF00FFC003FF0003FF80FFC003FF0003FF80FFC003FF0001FFC0FFC003FF00
+01FFC0FFC003FF0001FFC0FFC003FF0001FFC0FFC003FF0001FFC0FFC003FF0001FFC0FF
+C003FF0003FF80FFC003FF0003FF80FFC003FF0007FF00FFC003FF000FFE00FFC003FF00
+3FFC00FFC0FFFFFFFFF83FFFFFFFFFFFFFE03FFFFFFFFFFFFE003FFFFF40257EA445>I<
+FFFFFC000000FFFFFC000000FFFFFC00000003FF0000000003FF0000000003FF00000000
+03FF0000000003FF0000000003FF0000000003FF0000000003FF0000000003FF00000000
+03FF0000000003FF0000000003FF0000000003FFFFFE000003FFFFFFE00003FFFFFFF800
+03FF003FFC0003FF000FFE0003FF0007FF0003FF0003FF8003FF0003FF8003FF0001FFC0
+03FF0001FFC003FF0001FFC003FF0001FFC003FF0001FFC003FF0001FFC003FF0003FF80
+03FF0003FF8003FF0007FF0003FF000FFE0003FF003FFC00FFFFFFFFF800FFFFFFFFE000
+FFFFFFFE00002A257EA430>I<FFFFFC0000FFE00000FFFFFC0007FFFC0000FFFFFC003F
+FFFF800003FF00007FC07FC00003FF0001FF001FF00003FF0003FE000FF80003FF0007FC
+0007FC0003FF000FF80003FE0003FF000FF80003FE0003FF001FF80003FF0003FF001FF0
+0001FF0003FF003FF00001FF8003FF003FF00001FF8003FF003FF00001FF8003FF007FF0
+0001FFC003FFFFFFF00001FFC003FFFFFFF00001FFC003FFFFFFF00001FFC003FF007FF0
+0001FFC003FF007FF00001FFC003FF007FF00001FFC003FF007FF00001FFC003FF007FF0
+0001FFC003FF003FF00001FF8003FF003FF00001FF8003FF003FF00001FF8003FF001FF0
+0001FF0003FF001FF80003FF0003FF000FF80003FE0003FF000FF80003FE0003FF0007FC
+0007FC0003FF0003FE000FF80003FF0001FF001FF00003FF0000FFC07FE000FFFFFC003F
+FFFF8000FFFFFC000FFFFE0000FFFFFC0000FFE0000042257EA448>254
+D<0001FFFFFFF8003FFFFFFFF800FFFFFFFFF803FFC007FE0007FE0007FE000FFE0007FE
+000FFC0007FE001FFC0007FE001FFC0007FE001FFC0007FE001FFC0007FE001FFC0007FE
+000FFC0007FE0007FE0007FE0003FF0007FE0001FFE007FE00007FFFFFFE00001FFFFFFE
+000000FFFFFE000001FFE7FE000001FFC7FE000003FF87FE000007FF87FE00000FFF07FE
+00001FFE07FE00001FFC07FE00003FFC07FE00007FF807FE0000FFF007FE0001FFE007FE
+0001FFE007FE0003FFC007FE0007FF8007FE001FFF8007FE00FFFFF1FFFFF8FFFFF1FFFF
+F8FFFFF1FFFFF82D257EA432>I E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fg latt1000 10 75
+/Fg 75 126 df<000E0000003F8000007FC00001FFF00003FFF8000FFFFE001FFBFF007F
+F1FFC0FFC07FE0FF803FE0FE000FE07C0007C0780003C01B0D77B42D>2
+D<7FFFFFF0FFFFFFF8FFFFFFF8FFFFFFF87FFFFFF01D0579942C>21
+D<1F003F807FC0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FFE0FF
+E0FFE07FC07FC07FC07FC07FC07FC07FC07FC07FC07FC07FC07FC07FC07FC01F00000000
+00000000000000000000001F003F807FC0FFE0FFE0FFE0FFE0FFE07FC03F801F000B3470
+B32C>33 D<3C001E007F007F00FF007F80FF007F80FF007F80FF007F80FF007F80FF007F
+807F007F007F007F007F007F007F007F007F007F007F007F007E003F007E003F007E003F
+007E003F007E003F007E003F003E003E003E003E003E003E003C001E001C001C00191977
+B32C>I<0007001C00000F803E00000F803E00000F803E00000F803E00000F803E00000F
+803E00000F803E00000F803E00001F807E00001F007C00001F007C00001F007C00001F00
+7C003FFFFFFFE0FFFFFFFFF8FFFFFFFFF8FFFFFFFFF8FFFFFFFFF8003E00F800003E00F8
+00007E01F800007C01F000007C01F000007C01F000007C01F000007C01F000007C01F000
+007C01F000007C01F00000FC03F00000F803E00000F803E000FFFFFFFFF8FFFFFFFFF8FF
+FFFFFFF8FFFFFFFFF83FFFFFFFE001F007C00001F007C00001F007C00003F00FC00003E0
+0F800003E00F800003E00F800003E00F800003E00F800003E00F800003E00F800003E00F
+800001C007000025337DB22C>I<0001C000000003E000000003E000000003E000000003
+E000000003E000000003E00000000FFC0000007FFF800001FFFFE00007FFFFF0000FFFFF
+F8001FFBEFFC003FC3E1FE003F03E07F007E03E03F007C03E03F00FC03E03F80F803E03F
+80F803E07F80F803E07F80F803E07F80FC03E03F00FC03E03F007E03E000007F03E00000
+3FC3E000003FFBE000001FFFE000000FFFFC000007FFFF000001FFFFC000007FFFE00000
+1FFFF8000003FFFC000003E7FC000003E1FE000003E07F000003E03F001803E01F007E03
+E01F807E03E00F80FF03E00F80FF03E00F80FF03E00F80FE03E00F80FE03E01F80FE03E0
+1F007E03E03F007F03E03E003F83E0FE003FC3E1FC001FFBEFF8000FFFFFF00007FFFFE0
+0003FFFFC00000FFFF0000001FF800000003E000000003E000000003E000000003E00000
+0003E000000003E000000001C0000021417BB92C>I<07800007001FE0000F801FE0001F
+803FF0001F807FF8003F807FF8003F007CF8007F00FCFC007E00F87C007E00F87C00FE00
+F87C00FC00F87C01FC00F87C01F800F87C01F800F87C03F800FCFC03F0007CF803F0007F
+F807F0007FF807E0003FF00FE0001FE00FC0001FE00FC00007801FC00000001F80000000
+3F800000003F000000003F000000007F000000007E00000000FE00000000FC00000000FC
+00000001FC00000001F800000001F800000003F800000003F000000007F000000007E000
+000007E00000000FE00000000FC00000001FC00000001F800F00001F803FC0003F807FE0
+003F007FE0007F00FFF0007E00F9F0007E00F9F000FE01F9F800FC01F0F800FC01F0F801
+FC01F0F801F801F0F803F801F0F803F001F0F803F001F9F807F000F9F007E000F9F00FE0
+00FFF00FC0007FE00FC0007FE007C0003FC00380000F0025417DB92C>I<0F801FE03FF0
+7FF07FF87FF87FFC7FFC3FFC1FFC0FFC007C007C007C00FC00F800F801F801F003F007E0
+07E00FC03F807F80FF00FE00F80070000E1D71B22C>39 D<0000380000FC0001FC0003FC
+0007F8000FF0001FC0003F80007F0000FE0001FC0003F80003F00007F00007E0000FE000
+0FC0001F80001F80003F80003F00003F00007F00007E00007E00007E0000FE0000FC0000
+FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FE0000
+7E00007E00007E00007F00003F00003F00003F80001F80001F80000FC0000FE00007E000
+07F00003F00003F80001FC0000FE00007F00003F80001FC0000FF00007F80003FC0001FC
+0000FC000038164272B92C>I<700000FC0000FE0000FF00007F80003FC0000FE00007F0
+0003F80001FC0000FE00007F00003F00003F80001F80001FC0000FC00007E00007E00007
+F00003F00003F00003F80001F80001F80001F80001FC0000FC0000FC0000FC0000FC0000
+FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0001FC0001F80001F80001F80003
+F80003F00003F00007F00007E00007E0000FC0001FC0001F80003F80003F00007F0000FE
+0001FC0003F80007F0000FE0003FC0007F8000FF0000FE0000FC0000700000164279B92C
+>I<000380000007C0000007C0000007C0000007C0000007C0000007C0002007C008F807
+C03EFE07C0FEFF07C1FEFFC7C7FEFFE7CFFE3FFFFFF80FFFFFE003FFFF8001FFFF00007F
+FC00007FFC0001FFFF0003FFFF800FFFFFE03FFFFFF8FFE7CFFEFFC7C7FEFF07C1FEFE07
+C0FEF807C03E2007C0080007C0000007C0000007C0000007C0000007C0000007C0000003
+80001F247AAA2C>I<00007000000000F800000000F800000000F800000000F800000000
+F800000000F800000000F800000000F800000000F800000000F800000000F800000000F8
+00000000F800000000F800000000F800003FFFFFFFE0FFFFFFFFF8FFFFFFFFF8FFFFFFFF
+F8FFFFFFFFF80000F800000000F800000000F800000000F800000000F800000000F80000
+0000F800000000F800000000F800000000F800000000F800000000F800000000F8000000
+00F800000000F800000000F80000000070000025267DAB2C>I<0F801FE03FF07FF87FF8
+7FFC7FFC7FFC3FFC1FFC0FFC00FC00F800F801F803F007F01FE07FC0FF80FF00FC007000
+0E17718A2C>I<7FFFFFF0FFFFFFF8FFFFFFF8FFFFFFF87FFFFFF01D0579942C>I<1F003F
+807FC0FFE0FFE0FFE0FFE0FFE07FC03F801F000B0B708A2C>I<00000007000000000F80
+0000000F800000001F800000001F000000003F000000003E000000007E000000007C0000
+00007C00000000FC00000000F800000001F800000001F000000003F000000003E0000000
+07E000000007C00000000FC00000000F800000001F800000001F000000003F000000003E
+000000003E000000007E000000007C00000000FC00000000F800000001F800000001F000
+000003F000000003E000000007E000000007C00000000FC00000000F800000001F800000
+001F000000003F000000003E000000003E000000007E000000007C00000000FC00000000
+F800000001F800000001F000000003F000000003E000000007E000000007C00000000FC0
+0000000F800000001F800000001F000000001F000000003F000000003E000000007E0000
+00007C00000000FC00000000F800000000F800000000700000000021417BB92C>I<0003
+F80000000FFE0000003FFF8000007FFFC00000FFFFE00001FE0FF00003F803F80007F001
+FC0007E000FC000FC0007E000FC0007E001F80003F001F80003F003F00001F803F00001F
+803E00000F807E00000FC07E00000FC07E00000FC07C000007C0FC000007E0FC000007E0
+FC000007E0FC000007E0FC000007E0FC000007E0FC000007E0FC000007E0FC000007E0FC
+000007E0FC000007E0FC000007E0FE00000FE07E00000FC07E00000FC07E00000FC07E00
+000FC03F00001F803F00001F803F00001F801F80003F001F80003F000FC0007E000FE000
+FE0007E000FC0007F001FC0003F803F80001FE0FF00000FFFFE000007FFFC000003FFF80
+00000FFE00000003F8000023357CB32C>I<00070000000F8000000F8000001F8000001F
+8000003F8000007F800000FF800001FF800007FF80007FFF8000FFFF8000FFDF8000FF9F
+80007C1F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F
+8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F
+8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F
+8000001F8000001F8000001F8000001F8000001F8000001F80007FFFFFE0FFFFFFF0FFFF
+FFF0FFFFFFF07FFFFFE01C3477B32C>I<000FF80000007FFF800001FFFFE00007FFFFF0
+000FFFFFFC001FF80FFE003FE001FF003F80007F007F00003F807E00001F80FE00001FC0
+FE00000FC0FF00000FE0FF000007E0FF000007E0FF000007E07E000007E03C000007E000
+000007E000000007E00000000FE00000000FC00000001FC00000001F800000003F800000
+003F000000007F00000000FE00000001FC00000003FC00000007F80000000FF00000001F
+E00000003FC0000000FF80000001FE00000003FC00000007F80000000FF00000003FE000
+00007F80000000FF00000001FE00000003FC0003C007F80007E01FE00007E03FC00007E0
+7FFFFFFFE0FFFFFFFFE0FFFFFFFFE0FFFFFFFFE07FFFFFFFC023347CB32C>I<000FFC00
+00007FFF800001FFFFE00007FFFFF8000FFFFFFC001FF807FE001FC000FE003F80007F00
+3FC0003F003FC0003F803FC0001F803FC0001F801F80001F800F00001F800000001F8000
+00003F800000003F000000007F00000000FE00000001FE00000003FC0000001FF800001F
+FFF000003FFFE000003FFFE000003FFFF800001FFFFC00000007FE00000000FF00000000
+7F000000003F800000001FC00000000FC00000000FC00000000FE000000007E000000007
+E03C000007E07E000007E0FF000007E0FF00000FE0FF00000FC0FF00000FC0FE00001FC0
+7F00003F807F80007F003FC000FF001FF807FE000FFFFFFC0007FFFFF80003FFFFE00000
+7FFF8000000FFC000023357CB32C>I<000007F00000000FF80000001FF80000003FF800
+00003FF80000007EF80000007EF8000000FCF8000001F8F8000001F8F8000003F0F80000
+07E0F8000007E0F800000FC0F800001F80F800001F80F800003F00F800007E00F800007E
+00F80000FC00F80001F800F80001F800F80003F000F80003E000F80007E000F8000FC000
+F8000FC000F8001F8000F8003F0000F8003F0000F8007E0000F800FC0000F800FFFFFFFF
+FCFFFFFFFFFEFFFFFFFFFEFFFFFFFFFE7FFFFFFFFC000000F800000000F800000000F800
+000000F800000000F800000000F800000000F800000000F800000000F800000000F80000
+007FFFF00000FFFFF80000FFFFF80000FFFFF800007FFFF027347EB32C>I<0FFFFFFE00
+1FFFFFFF001FFFFFFF001FFFFFFF001FFFFFFE001F800000001F800000001F800000001F
+800000001F800000001F800000001F800000001F800000001F800000001F800000001F80
+0000001F800000001F800000001F83FE00001F9FFF80001FFFFFE0001FFFFFF8001FFFFF
+FC001FFE03FE001FF000FF001FC0007F001F80003F801F00001F800F00001FC00000000F
+C00000000FC000000007E000000007E000000007E000000007E03C000007E07E000007E0
+FF000007E0FF00000FE0FF00000FC0FF00000FC0FE00001FC07E00003F807F00007F003F
+8000FF003FC001FE001FF80FFC000FFFFFF80007FFFFF00001FFFFC000007FFF0000000F
+F8000023347CB22C>I<1F003F807FC0FFE0FFE0FFE0FFE0FFE07FC03F801F0000000000
+0000000000000000000000000000000000000000000000001F003F807FC0FFE0FFE0FFE0
+FFE0FFE07FC03F801F000B2470A32C>58 D<00000002000000000F800000001F80000000
+7F80000000FF80000003FE0000000FFC0000001FF00000007FE0000000FF80000003FE00
+000007FC0000001FF00000003FE0000000FF80000003FF00000007FC0000001FF8000000
+3FE0000000FF80000000FF00000000FF00000000FF800000003FE00000001FF800000007
+FC00000003FF00000000FF800000003FE00000001FF000000007FC00000003FE00000000
+FF800000007FE00000001FF00000000FFC00000003FE00000000FF800000007F80000000
+1F800000000F800000000200212A7BAD2C>60 D<2000000000F800000000FC00000000FF
+00000000FF800000003FE00000001FF800000007FC00000003FF00000000FF800000003F
+E00000001FF000000007FC00000003FE00000000FF800000007FE00000001FF00000000F
+FC00000003FE00000000FF800000007F800000007F80000000FF80000003FE0000000FFC
+0000001FF00000007FE0000000FF80000003FE00000007FC0000001FF00000003FE00000
+00FF80000003FF00000007FC0000001FF80000003FE0000000FF80000000FF00000000FC
+00000000F8000000002000000000212A7BAD2C>62 D<003FFE000003FFFFC0000FFFFFF0
+001FFFFFFC003FFFFFFE007FE007FF007F0000FF00FE00003F80FF00001F80FF00001F80
+FF00001F80FF00003F807E00007F003C0000FF00000003FE0000000FFC0000001FF80000
+003FE00000007FC0000000FF00000001FE00000003FC00000003F800000007F800000007
+F00000000FF00000000FE00000000FE00000000FE00000000FE00000000FE00000000FE0
+0000000FE000000007C00000000000000000000000000000000000000000000000000000
+000000000000000000000000000000000003800000000FE00000000FE00000001FF00000
+001FF00000001FF00000000FE00000000FE00000000380000021337BB22C>I<00007F80
+000003FFE000000FFFF000003FFFF800007FFFFC0000FFC0FE0001FE007F0003F8003F00
+07F0001F8007E00FCF800FC03FFF801F807FFFC01F80FFFFC03F01FFFFC03E03F87FC03E
+07F03FE07E07E01FE07C0FC00FE07C0F8007E07C0F8007E0FC1F8007E0F81F0003E0F81F
+0003E0F81F0003E0F81F0003E0F81F0003E0F81F0003E0F81F0003E0F81F0003E0F81F00
+03E0FC1F8007E07C0F8007C07C0F8007C07C0FC00FC07E07E01F803E07F03F803E03F87F
+003F01FFFE001F80FFFC001F807FF8000FC03FF00007E00FC00007F00007C003F8000FE0
+01FE001FE000FFC0FFE0007FFFFFC0003FFFFF80000FFFFE000003FFF80000007FC00023
+337CB22C>I<0000FE00000001FF00000001FF00000001FF00000001FF00000003FF8000
+0003FF80000003EF80000003EF80000007EF80000007EFC0000007EFC0000007C7C00000
+07C7C000000FC7E000000FC7E000000FC7E000000FC3E000001F83F000001F83F000001F
+83F000001F83F000001F83F000003F01F800003F01F800003F01F800003F01F800007E00
+FC00007E00FC00007E00FC00007E00FC00007E00FC0000FC007E0000FFFFFE0000FFFFFE
+0000FFFFFE0001FFFFFF0001FFFFFF0001F8003F0001F8003F0001F8003F0003F0001F80
+03F0001F8003F0001F8003F0001F8007F0001FC007E0000FC07FFE00FFFC7FFF01FFFCFF
+FF01FFFE7FFF01FFFC7FFE00FFFC27347EB32C>I<7FFFFFE0007FFFFFF800FFFFFFFE00
+7FFFFFFF007FFFFFFFC003F0003FC003F0000FE003F00007F003F00003F003F00003F003
+F00001F803F00001F803F00001F803F00001F803F00001F803F00001F803F00003F003F0
+0003F003F00007F003F0000FE003F0001FC003F000FF8003FFFFFF0003FFFFFE0003FFFF
+FC0003FFFFFF0003FFFFFFC003F0001FE003F00007F003F00003F803F00001F803F00000
+FC03F00000FC03F00000FE03F000007E03F000007E03F000007E03F000007E03F000007E
+03F000007E03F00000FE03F00000FC03F00001FC03F00003F803F0000FF803F0003FF07F
+FFFFFFE07FFFFFFFC0FFFFFFFF807FFFFFFE007FFFFFF00027337FB22C>I<0000FF0070
+0007FFE0F8000FFFF9F8003FFFFDF8007FFFFFF800FF81FFF801FE007FF803FC001FF807
+F0000FF807F00007F80FE00007F80FC00003F81F800003F81F800001F83F000001F83F00
+0001F87F000001F87E000000F07E000000007E00000000FE00000000FC00000000FC0000
+0000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC000000
+00FC00000000FC00000000FE000000007E000000007E000000007E000000007F000000F0
+3F000001F83F000001F81F800001F81F800001F80FC00003F80FE00003F007F00007F007
+F00007E003FC001FE001FE003FC000FF81FF80007FFFFF00003FFFFE00000FFFFC000007
+FFF0000000FF800025357DB32C>I<7FFFFF0000FFFFFFC000FFFFFFF000FFFFFFF8007F
+FFFFFC0007E003FE0007E000FF0007E0007F8007E0003F8007E0001FC007E0000FE007E0
+000FE007E00007E007E00007F007E00003F007E00003F807E00001F807E00001F807E000
+01F807E00001F807E00000FC07E00000FC07E00000FC07E00000FC07E00000FC07E00000
+FC07E00000FC07E00000FC07E00000FC07E00000FC07E00000FC07E00000FC07E00001F8
+07E00001F807E00001F807E00003F807E00003F007E00003F007E00007F007E00007E007
+E0000FE007E0001FC007E0003FC007E0007F8007E000FF0007E003FE007FFFFFFC00FFFF
+FFF800FFFFFFF000FFFFFFC0007FFFFF000026337EB22C>I<7FFFFFFFF0FFFFFFFFF8FF
+FFFFFFF8FFFFFFFFF87FFFFFFFF803F00001F803F00001F803F00001F803F00001F803F0
+0001F803F00001F803F00001F803F00000F003F000000003F000000003F000000003F000
+000003F001E00003F003F00003F003F00003F003F00003F003F00003FFFFF00003FFFFF0
+0003FFFFF00003FFFFF00003FFFFF00003F003F00003F003F00003F003F00003F003F000
+03F001E00003F000000003F000000003F000000003F000000003F000000003F000003C03
+F000007E03F000007E03F000007E03F000007E03F000007E03F000007E03F000007E03F0
+00007E7FFFFFFFFEFFFFFFFFFEFFFFFFFFFEFFFFFFFFFE7FFFFFFFFC27337EB22C>I<7F
+FFFFFFF8FFFFFFFFFCFFFFFFFFFCFFFFFFFFFC7FFFFFFFFC03F00000FC03F00000FC03F0
+0000FC03F00000FC03F00000FC03F00000FC03F00000FC03F000007803F000000003F000
+000003F000000003F000000003F000000003F000F00003F001F80003F001F80003F001F8
+0003F001F80003FFFFF80003FFFFF80003FFFFF80003FFFFF80003FFFFF80003F001F800
+03F001F80003F001F80003F001F80003F000F00003F000000003F000000003F000000003
+F000000003F000000003F000000003F000000003F000000003F000000003F000000003F0
+00000003F000000003F00000007FFFE00000FFFFE00000FFFFF00000FFFFE000007FFFE0
+000026337EB22C>I<0001FC0380000FFF87C0001FFFEFC0007FFFFFC000FFFFFFC001FF
+07FFC003FC01FFC003F800FFC007F0007FC00FE0003FC00FC0001FC01FC0001FC01F8000
+1FC03F80000FC03F00000FC03F00000FC07E00000FC07E000007807E000000007E000000
+00FE00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000
+FC00000000FC00000000FC0003FFF8FC0007FFFCFC0007FFFCFE0007FFFC7E0003FFF87E
+00000FC07E00000FC07E00000FC03F00001FC03F00001FC03F80001FC01F80001FC01FC0
+003FC00FC0003FC00FE0007FC007F0007FC003F800FFC003FC01FFC001FF07FFC000FFFF
+FFC0007FFFEFC0001FFFCFC0000FFF07800001FC000026357DB32C>I<7FFFE00000FFFF
+F00000FFFFF00000FFFFF000007FFFE0000003F000000003F000000003F000000003F000
+000003F000000003F000000003F000000003F000000003F000000003F000000003F00000
+0003F000000003F000000003F000000003F000000003F000000003F000000003F0000000
+03F000000003F000000003F000000003F000000003F000000003F000000003F000000003
+F000000003F000000003F000000003F000000003F000000003F000000003F000000003F0
+0000F003F00001F803F00001F803F00001F803F00001F803F00001F803F00001F803F000
+01F803F00001F87FFFFFFFF8FFFFFFFFF8FFFFFFFFF8FFFFFFFFF87FFFFFFFF025337DB2
+2C>76 D<7FE0000FFCFFF0001FFEFFF0001FFEFFF8003FFE7FF8003FFC0FF8003FE00FBC
+007BE00FBC007BE00FBC007BE00FBC007BE00F9E00F3E00F9E00F3E00F9E00F3E00F9F01
+F3E00F9F01F3E00F8F01E3E00F8F01E3E00F8F83E3E00F8F83E3E00F8783C3E00F87C7C3
+E00F87C7C3E00F83C783E00F83C783E00F83EF83E00F83EF83E00F81EF03E00F81EF03E0
+0F81FF03E00F80FE03E00F80FE03E00F80FE03E00F807C03E00F803803E00F800003E00F
+800003E00F800003E00F800003E00F800003E00F800003E00F800003E00F800003E00F80
+0003E00F800003E00F800003E00F800003E07FF0001FFCFFF8003FFEFFF8003FFEFFF800
+3FFE7FF0001FFC27337EB22C>I<7FFFFFC000FFFFFFF800FFFFFFFC00FFFFFFFF007FFF
+FFFF8003F000FFC003F0003FC003F0000FE003F00007F003F00007F003F00003F003F000
+03F803F00001F803F00001F803F00001F803F00001F803F00001F803F00001F803F00003
+F803F00003F003F00007F003F00007F003F0000FE003F0003FC003F000FFC003FFFFFF80
+03FFFFFF0003FFFFFC0003FFFFF80003FFFFC00003F000000003F000000003F000000003
+F000000003F000000003F000000003F000000003F000000003F000000003F000000003F0
+00000003F000000003F000000003F000000003F000000003F00000007FFF800000FFFFC0
+0000FFFFC00000FFFFC000007FFF80000025337EB22C>80 D<7FFFFC000000FFFFFF8000
+00FFFFFFE00000FFFFFFF800007FFFFFFC000007E007FE000007E001FE000007E0007F00
+0007E0003F800007E0001F800007E0001F800007E0000FC00007E0000FC00007E0000FC0
+0007E0000FC00007E0000FC00007E0000FC00007E0001F800007E0001F800007E0003F80
+0007E0007F000007E001FE000007E007FE000007FFFFFC000007FFFFF8000007FFFFE000
+0007FFFFF0000007FFFFF8000007E007FC000007E001FE000007E000FE000007E0007F00
+0007E0003F000007E0003F000007E0003F000007E0003F000007E0003F000007E0003F00
+0007E0003F000007E0003F000007E0003F0F0007E0003F1F8007E0003F1F8007E0003F1F
+8007E0003F1F8007E0003F1F807FFE001FBF80FFFF001FFF00FFFF000FFF00FFFF000FFE
+007FFE0007FC0000000001F00029347EB22C>82 D<001FF8070000FFFF0F8001FFFFCF80
+07FFFFFF800FFFFFFF801FF01FFF803FC003FF803F8001FF807F0000FF807E00007F80FE
+00003F80FC00003F80FC00001F80FC00001F80FC00001F80FC00001F80FE00000F007E00
+0000007F000000007F800000003FE00000001FFC0000001FFFC000000FFFFC000003FFFF
+C00001FFFFF000007FFFF8000007FFFC0000007FFE00000007FF00000000FF800000003F
+800000001FC00000001FC00000000FE00000000FE078000007E0FC000007E0FC000007E0
+FC000007E0FC000007E0FC000007E0FE00000FC0FE00000FC0FF00001F80FF80003F80FF
+E0007F00FFFE01FF00FFFFFFFE00FFFFFFFC00F9FFFFF000F83FFFC0007007FF00002335
+7CB32C>I<7FFFFFFFFCFFFFFFFFFEFFFFFFFFFEFFFFFFFFFEFFFFFFFFFEFC007E007EFC
+007E007EFC007E007EFC007E007EFC007E007EFC007E007EFC007E007E78007E003C0000
+7E000000007E000000007E000000007E000000007E000000007E000000007E000000007E
+000000007E000000007E000000007E000000007E000000007E000000007E000000007E00
+0000007E000000007E000000007E000000007E000000007E000000007E000000007E0000
+00007E000000007E000000007E000000007E000000007E000000007E000000007E000000
+007E000000007E000000007E000000007E0000003FFFFC00003FFFFC00007FFFFE00003F
+FFFC00003FFFFC0027337EB22C>I<7FF00007FF00FFF8000FFF80FFF8000FFF80FFF800
+0FFF807FF00007FF001F0000007C001F0000007C001F0000007C001F0000007C000F8000
+00F8000F800000F8000F800000F8000F800000F8000F800000F8000F800000F8000F8000
+00F80007C00001F00007C00001F00007C00001F00007C00001F00007C03E01F00007C07F
+01F00007C07F01F00007C07F01F00003E0FF83E00003E0FF83E00003E0F783E00003E0F7
+83E00003E1F7C3E00003E1F7C3E00003E1F7C3E00001E1E3C3C00001E1E3C3C00001F1E3
+C7C00001F3E3E7C00001F3E3E7C00001F3E3E7C00001F3C1E7C00001F3C1E7C00000F3C1
+E7800000F3C1E7800000F7C1F7800000F780F7800000F780F7800000F780F7800000FF80
+FF8000007F80FF0000007F007F0000007F007F0000007F007F0000007F007F0000003E00
+3E000029347FB22C>87 D<7FFFFCFFFFFEFFFFFEFFFFFEFFFFFCFC0000FC0000FC0000FC
+0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC
+0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC
+0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC
+0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC0000FC
+0000FC0000FC0000FC0000FFFFFCFFFFFEFFFFFEFFFFFE7FFFFC17416FB92C>91
+D<7000000000F800000000F800000000FC000000007C000000007E000000003E00000000
+3F000000001F000000001F000000001F800000000F800000000FC000000007C000000007
+E000000003E000000003F000000001F000000001F800000000F800000000FC000000007C
+000000007E000000003E000000003E000000003F000000001F000000001F800000000F80
+0000000FC000000007C000000007E000000003E000000003F000000001F000000001F800
+000000F800000000FC000000007C000000007E000000003E000000003E000000003F0000
+00001F000000001F800000000F800000000FC000000007C000000007E000000003E00000
+0003F000000001F000000001F800000000F800000000FC000000007C000000007C000000
+007E000000003E000000003F000000001F000000001F800000000F800000000F80000000
+070021417BB92C>I<7FFFFCFFFFFEFFFFFEFFFFFE7FFFFE00007E00007E00007E00007E
+00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E
+00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E
+00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E
+00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E00007E
+00007E00007E00007E7FFFFEFFFFFEFFFFFEFFFFFE7FFFFC17417DB92C>I<7FFFFFFF00
+FFFFFFFF80FFFFFFFF80FFFFFFFF80FFFFFFFF807FFFFFFF0021067B7D2C>95
+D<0038007C01FC03FC07F807F00FC01F801F803F003E007E007C007C00FC00F800F800F8
+00FFC0FFE0FFF0FFF8FFF87FF87FF83FF83FF01FE007C00E1D72B82C>I<01FFF0000007
+FFFE00001FFFFF80001FFFFFE0003FFFFFF0003FC01FF8003FC007F8003FC001FC001F80
+00FC00060000FE000000007E000000007E000000007E000000FFFE00001FFFFE0000FFFF
+FE0003FFFFFE000FFFFFFE001FFF807E003FF8007E007FC0007E007F00007E00FE00007E
+00FC00007E00FC00007E00FC00007E00FC00007E00FE00007E007F0000FE007F8003FE00
+3FE01FFE001FFFFFFFFC0FFFFFFFFE07FFFFBFFE01FFFE1FFE003FF007FC27247CA32C>
+I<7FF0000000FFF8000000FFF8000000FFF80000007FF800000001F800000001F8000000
+01F800000001F800000001F800000001F800000001F800000001F800000001F800000001
+F800000001F81FE00001F8FFF80001FBFFFE0001FFFFFF0001FFFFFF8001FFF07FC001FF
+801FE001FF0007F001FE0003F801FC0003F801FC0001FC01F80000FC01F80000FC01F800
+00FE01F800007E01F800007E01F800007E01F800007E01F800007E01F800007E01F80000
+7E01F800007E01F80000FE01FC0000FC01FC0000FC01FC0001F801FE0003F801FF0007F0
+01FF000FF001FF801FE001FFE07FC001FFFFFF8001FFFFFF0001FBFFFE0001F8FFF80000
+F03FC00027337FB22C>I<0003FFE000001FFFF800007FFFFE0001FFFFFE0003FFFFFF00
+07FE00FF000FF000FF001FE000FF001FC0007E003F800018003F000000007F000000007E
+000000007E00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00
+000000FC00000000FC000000007E000000007E000000007F000000003F00000F003F8000
+1F801FC0001F801FE0003F800FF0007F0007FE03FF0003FFFFFE0001FFFFFC00007FFFF8
+00001FFFE0000003FF000021247AA32C>I<00000FFE0000001FFF0000001FFF0000001F
+FF0000000FFF000000003F000000003F000000003F000000003F000000003F000000003F
+000000003F000000003F000000003F000000003F000007F83F00003FFE3F0000FFFFBF00
+01FFFFFF0003FFFFFF0007FC0FFF000FF003FF001FE001FF001FC000FF003F80007F003F
+00007F007E00003F007E00003F00FE00003F00FC00003F00FC00003F00FC00003F00FC00
+003F00FC00003F00FC00003F00FC00003F00FC00003F00FE00003F007E00007F007E0000
+7F007F0000FF003F8000FF003F8001FF001FC003FF000FF007FF0007FC1FFF0003FFFFFF
+FC01FFFFBFFE00FFFF3FFE003FFC3FFE000FF01FFC27337DB22C>I<0003FE0000001FFF
+C000007FFFF00001FFFFF80003FFFFFC0007FE03FE000FF800FF001FE0003F801FC0003F
+803F80001FC03F00000FC07F00000FC07E00000FE07E000007E0FC000007E0FFFFFFFFE0
+FFFFFFFFE0FFFFFFFFE0FFFFFFFFE0FFFFFFFFC0FC00000000FE000000007E000000007E
+000000007F000000003F000003C03F800007E01FC00007E00FF0000FE007F8003FC007FF
+00FFC001FFFFFF8000FFFFFF00003FFFFC00000FFFF0000001FF800023247CA32C>I<00
+000FF80000003FFE000000FFFF000001FFFF800003FFFF800007FC7F800007F07F80000F
+E03F00000FC03F00000FC00000000FC00000000FC00000000FC00000000FC00000000FC0
+00007FFFFFFE00FFFFFFFF00FFFFFFFF00FFFFFFFF007FFFFFFE00000FC00000000FC000
+00000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000
+000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC0000000
+0FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000F
+C00000000FC00000000FC000003FFFFFF0007FFFFFF8007FFFFFF8007FFFFFF8003FFFFF
+F00021337DB22C>I<00000003F80007F80FFC001FFE3FFE007FFFFFFF01FFFFFFFF03FF
+FFFE7F03FC0FF87F07F003F83E0FE001FC1C0FC000FC001FC000FE001F80007E001F8000
+7E001F80007E001F80007E001F80007E001F80007E001FC000FE000FC000FC000FE001FC
+0007F003F80003FC0FF00007FFFFF00007FFFFE0000FFFFF80000F9FFE00000F87F80000
+0F800000000F800000000F800000000FC000000007E000000007FFFFF00003FFFFFE0007
+FFFFFF800FFFFFFFE01FFFFFFFF03FC0001FF87F000003FC7E000000FC7C0000007CFC00
+00007EF80000003EF80000003EF80000003EF80000003EFC0000007E7E000000FC7F8000
+03FC3FE0000FF81FFC007FF00FFFFFFFE003FFFFFF8001FFFFFF00003FFFF8000007FFC0
+0028387EA42C>I<7FF000000000FFF800000000FFF800000000FFF8000000007FF80000
+000001F80000000001F80000000001F80000000001F80000000001F80000000001F80000
+000001F80000000001F80000000001F80000000001F80000000001F81FE0000001F87FFC
+000001F9FFFE000001FBFFFF000001FFFFFF000001FFF03F800001FFC01F800001FF801F
+C00001FF000FC00001FE000FC00001FC000FC00001FC000FC00001F8000FC00001F8000F
+C00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000F
+C00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000F
+C00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC0007FFFE0FF
+FF00FFFFF1FFFF80FFFFF1FFFF80FFFFF1FFFF807FFFE0FFFF0029337FB22C>I<000700
+00001FC000001FC000003FE000003FE000003FE000001FC000001FC00000070000000000
+000000000000000000000000000000000000000000000000007FFFC0007FFFE000FFFFE0
+007FFFE0007FFFE0000007E0000007E0000007E0000007E0000007E0000007E0000007E0
+000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0
+000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0000007E0
+000007E0007FFFFFFCFFFFFFFEFFFFFFFEFFFFFFFE7FFFFFFC1F3479B32C>I<00000E00
+00003F8000003F8000007FC000007FC000007FC000003F8000003F8000000E0000000000
+00000000000000000000000000000000000000000000000001FFFF8003FFFFC003FFFFC0
+03FFFFC001FFFFC000000FC000000FC000000FC000000FC000000FC000000FC000000FC0
+00000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC0
+00000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC0
+00000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC000000FC0
+00000FC000000FC000000FC000000FC000001FC03C001F807E003F80FF003F00FF007F00
+FF01FE00FFFFFC007FFFF8007FFFF0001FFFE00007FF00001A467CB32C>I<7FE0000000
+FFF0000000FFF0000000FFF00000007FF000000001F000000001F000000001F000000001
+F000000001F000000001F000000001F000000001F000000001F000000001F000000001F0
+1FFFF001F03FFFF801F03FFFF801F03FFFF801F01FFFF001F000FE0001F001FC0001F003
+F80001F007F00001F00FE00001F01FC00001F03F800001F07F000001F0FE000001F1FC00
+0001F3FC000001F7FE000001FFFF000001FFFF000001FF9F800001FF0FC00001FE0FE000
+01FC07E00001F803F00001F001F80001F001FC0001F000FC0001F0007E0001F0003F0001
+F0003F8001F0001F807FFFC0FFFCFFFFE1FFFEFFFFE1FFFEFFFFE1FFFE7FFFC0FFFC2733
+7EB22C>I<7FFFE00000FFFFF00000FFFFF00000FFFFF000007FFFF000000003F0000000
+03F000000003F000000003F000000003F000000003F000000003F000000003F000000003
+F000000003F000000003F000000003F000000003F000000003F000000003F000000003F0
+00000003F000000003F000000003F000000003F000000003F000000003F000000003F000
+000003F000000003F000000003F000000003F000000003F000000003F000000003F00000
+0003F000000003F000000003F000000003F000000003F000000003F000000003F0000000
+03F000000003F000000003F000000003F000007FFFFFFF80FFFFFFFFC0FFFFFFFFC0FFFF
+FFFFC07FFFFFFF8022337BB22C>I<7F83F007E0007FCFFC1FF800FFDFFE3FFC007FFFFE
+FFFC007FFFFFFFFE0007FE1FFC3E0007FC1FF83F0007F80FF01F0007F00FE01F0007E00F
+C01F0007E00FC01F0007E00FC01F0007C00F801F0007C00F801F0007C00F801F0007C00F
+801F0007C00F801F0007C00F801F0007C00F801F0007C00F801F0007C00F801F0007C00F
+801F0007C00F801F0007C00F801F0007C00F801F0007C00F801F0007C00F801F0007C00F
+801F0007C00F801F0007C00F801F0007C00F801F007FFC3FF87FF07FFC7FF8FFF0FFFE7F
+FCFFF87FFC7FF8FFF07FFC3FF87FF02D2481A32C>I<7FF01FE00000FFF87FFC0000FFF9
+FFFE0000FFFBFFFF00007FFFFFFF000001FFF03F800001FFC01F800001FF801FC00001FF
+000FC00001FE000FC00001FC000FC00001FC000FC00001F8000FC00001F8000FC00001F8
+000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8
+000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8
+000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC0007FFFE0FFFF00FFFF
+F1FFFF80FFFFF1FFFF80FFFFF1FFFF807FFFE0FFFF0029247FA32C>I<0007FC0000001F
+FF0000007FFFC00001FFFFF00003FFFFF80007FC07FC000FF001FE001FE000FF001F8000
+3F003F80003F803F00001F807E00000FC07E00000FC07E00000FC0FC000007E0FC000007
+E0FC000007E0FC000007E0FC000007E0FC000007E0FC000007E0FE00000FE07E00000FC0
+7E00000FC07F00001FC03F00001F803F80003F801FC0007F001FE000FF000FF001FE0007
+FC07FC0003FFFFF80001FFFFF000007FFFC000001FFF00000007FC000023247CA32C>I<
+7FF01FE000FFF8FFF800FFFBFFFE00FFFFFFFF007FFFFFFF8001FFF07FC001FF801FE001
+FF0007F001FE0003F801FC0003F801FC0001FC01F80000FC01F80000FC01F80000FE01F8
+00007E01F800007E01F800007E01F800007E01F800007E01F800007E01F800007E01F800
+007E01F80000FE01FC0000FC01FC0000FC01FC0001F801FE0003F801FF0007F001FF000F
+F001FF801FE001FFE07FC001FFFFFF8001FFFFFF0001FBFFFE0001F8FFF80001F83FC000
+01F800000001F800000001F800000001F800000001F800000001F800000001F800000001
+F800000001F800000001F800000001F800000001F800000001F80000007FFFE00000FFFF
+F00000FFFFF00000FFFFF000007FFFE0000027367FA32C>I<0003FC078000001FFF0FC0
+00007FFFCFC00001FFFFEFC00003FFFFFFC00007FE07FFC0000FF001FFC0001FE000FFC0
+001FC0007FC0003F80003FC0003F00003FC0007F00001FC0007E00001FC0007E00000FC0
+00FC00000FC000FC00000FC000FC00000FC000FC00000FC000FC00000FC000FC00000FC0
+00FC00000FC000FC00000FC000FE00000FC0007E00001FC0007E00001FC0003F00003FC0
+003F80003FC0001FC0007FC0001FE000FFC0000FF003FFC00007FC0FFFC00003FFFFFFC0
+0001FFFFEFC000007FFF8FC000003FFF0FC0000007F80FC0000000000FC0000000000FC0
+000000000FC0000000000FC0000000000FC0000000000FC0000000000FC0000000000FC0
+000000000FC0000000000FC0000000000FC0000000000FC0000000000FC000000003FFFF
+00000007FFFF80000007FFFF80000007FFFF80000003FFFF0029367DA32C>I<7FFE003F
+C0FFFF01FFF0FFFF07FFF8FFFF1FFFFC7FFF3FFFFC003F7FE1FC003FFF01FC003FFC00F8
+003FF80070003FF00000003FE00000003FE00000003FC00000003F800000003F80000000
+3F800000003F000000003F000000003F000000003F000000003F000000003F000000003F
+000000003F000000003F000000003F000000003F000000003F000000003F000000003F00
+0000003F0000007FFFFFE000FFFFFFF000FFFFFFF000FFFFFFF0007FFFFFE00026247EA3
+2C>I<007FF87003FFFFF80FFFFFF81FFFFFF83FFFFFF87FC00FF87E0003F8FC0001F8F8
+0001F8F80001F8F80001F8FC0000F07F0000007FF000003FFFC0001FFFFE000FFFFF8003
+FFFFE0007FFFF80001FFFC000007FC000000FE7800007FFC00003FFC00001FFE00001FFE
+00001FFF00003FFF80003EFFC000FEFFF007FCFFFFFFFCFFFFFFF8FFFFFFE0F8FFFF8070
+1FFC0020247AA32C>I<001E000000003F000000003F000000003F000000003F00000000
+3F000000003F000000003F000000003F000000003F0000007FFFFFFF00FFFFFFFF80FFFF
+FFFF80FFFFFFFF807FFFFFFF00003F000000003F000000003F000000003F000000003F00
+0000003F000000003F000000003F000000003F000000003F000000003F000000003F0000
+00003F000000003F000000003F000000003F000000003F000000003F0003C0003F0007E0
+003F0007E0003F0007E0003F0007E0003F0007E0003F800FE0001F801FC0001FE07FC000
+0FFFFF80000FFFFF000003FFFE000001FFF80000003FE000232E7EAD2C>I<7FF003FF80
+00FFF807FFC000FFF807FFC000FFF807FFC0007FF803FFC00001F8000FC00001F8000FC0
+0001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC0
+0001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC0
+0001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC00001F8000FC0
+0001F8000FC00001F8001FC00001F8001FC00001F8003FC00001FC007FC00000FE03FFC0
+0000FFFFFFFF00007FFFFFFF80003FFFFFFF80001FFFCFFF800003FE07FF0029247FA32C
+>I<7FFF01FFFCFFFF01FFFEFFFF83FFFEFFFF01FFFE7FFF01FFFC03E0000F8003E0000F
+8003F0001F8001F0001F0001F0001F0001F8003F0000F8003E0000F8003E0000FC007E00
+007C007C00007C007C00007E00FC00003E00F800003E00F800003F01F800001F01F00000
+1F01F000001F83F000000F83E000000F83E000000FC7E0000007C7C0000007C7C0000007
+EFC0000003EF80000003EF80000003FF80000001FF00000001FF00000000FE000000007C
+000027247EA32C>I<7FFF007FFF007FFF80FFFF00FFFF80FFFF807FFF80FFFF007FFF00
+7FFF0007C00001F00007C00001F00007C00001F00007C00001F00007C00001F00007C000
+01F00003E00003E00003E00003E00003E00003E00003E03E03E00003E07F03E00003E07F
+03E00001F07F07C00001F0FF87C00001F0FF87C00001F0F787C00001F0F787C00001F1F7
+C7C00000F1F7C7800000F9E3CF800000F9E3CF800000FBE3EF800000FBE3EF800000FBE3
+EF8000007BC1EF0000007FC1FF0000007FC1FF0000007F80FF0000007F80FF0000003F80
+FE0000001F007C000029247FA32C>I<3FFF03FFF07FFF87FFF87FFF87FFF87FFF87FFF8
+3FFF03FFF000FC007E0000FC00FC00007E01F800003F01F000001F83F000001F87E00000
+0FCFC0000007EF80000003FF80000001FF00000001FE00000000FC000000007C00000000
+FE00000001FE00000001FF00000003EF80000007CFC000000FC7C000000F83E000001F01
+F000003F01F800007E00F800007C007C0000F8007E0001F8003F007FFF01FFFC7FFF83FF
+FCFFFF83FFFE7FFF83FFFC7FFF01FFFC27247EA32C>I<7FFF01FFFCFFFF81FFFEFFFF83
+FFFEFFFF81FFFE7FFF01FFFC03E0000F8001F0000F8001F0001F8001F8001F0000F8001F
+0000F8003F0000FC003E00007C003E00007E007E00003E007C00003E007C00003F00FC00
+001F00F800001F00F800000F81F800000F81F000000F81F0000007C1F0000007C3E00000
+07C3E0000003E3E0000003E7C0000001E7C0000001F7C0000001F780000000FF80000000
+FF80000000FF000000007F000000007F000000003E000000003E000000007E000000007C
+000000007C00000000FC00000000F800000000F800000C01F800003F01F000007F83F000
+007F87E000007E0FE000007E1FC000007FFF8000003FFF0000001FFE0000000FFC000000
+07E000000027367EA32C>I<3FFFFFFFE07FFFFFFFF07FFFFFFFF07FFFFFFFF07FFFFFFF
+F07E00001FE07E00003FC07E00007F807E0000FF007E0001FE003C0003FC00000007F800
+00000FF00000001FE00000003FC00000007F80000000FF00000001FC00000003F8000000
+0FF00000001FE00000003FC00000007F80000000FF00000001FE0001E003FC0003F007F8
+0003F00FF00003F01FE00003F03FC00003F07F800003F0FFFFFFFFF0FFFFFFFFF0FFFFFF
+FFF0FFFFFFFFF07FFFFFFFE024247DA32C>I<000000FF00000007FF8000001FFF800000
+7FFF800000FFFF000001FFC0000001FE00000003F800000003F000000003F000000003F0
+00000003F000000003F000000003F000000003F000000003F000000003F000000003F000
+000003F000000003F000000003F000000003F000000003F000000003F000000003F00000
+0003F000000003F000000007F00000001FE0000000FFE000007FFFC00000FFFF800000FF
+FE000000FFFF8000007FFFC0000000FFE00000001FE000000007F000000003F000000003
+F000000003F000000003F000000003F000000003F000000003F000000003F000000003F0
+00000003F000000003F000000003F000000003F000000003F000000003F000000003F000
+000003F000000003F000000003F000000003F800000001FE00000001FFC0000000FFFF00
+00007FFF8000001FFF80000007FF80000000FF0021417BB92C>I<78FCFCFCFCFCFCFCFC
+FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC
+FCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFCFC7806416DB92C>I<7FC0000000FFF80000
+00FFFE000000FFFF8000007FFFC0000000FFE00000001FE000000007F000000003F00000
+0003F000000003F000000003F000000003F000000003F000000003F000000003F0000000
+03F000000003F000000003F000000003F000000003F000000003F000000003F000000003
+F000000003F000000003F000000003F000000003F800000001FE00000001FFC0000000FF
+FF0000007FFF8000001FFF8000007FFF800000FFFF000001FFC0000001FE00000003F800
+000003F000000003F000000003F000000003F000000003F000000003F000000003F00000
+0003F000000003F000000003F000000003F000000003F000000003F000000003F0000000
+03F000000003F000000003F000000003F000000003F000000007F00000001FE0000000FF
+E000007FFFC00000FFFF800000FFFE000000FFF80000007FC000000021417BB92C>I
+E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fh labx1440 14.4 68
+/Fh 68 256 df<0000001E0000003E000000FC000001F8000003F0000007E000000FE000
+001FC000003F8000007F000000FF000000FE000001FC000003FC000007F8000007F80000
+0FF000001FF000001FE000003FE000003FC000007FC000007F800000FF800000FF800001
+FF000001FF000003FF000003FE000007FE000007FE000007FC00000FFC00000FFC00000F
+FC00001FF800001FF800001FF800001FF800003FF800003FF800003FF000003FF000007F
+F000007FF000007FF000007FF000007FF000007FF000007FE00000FFE00000FFE00000FF
+E00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FF
+E00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FF
+E000007FE000007FF000007FF000007FF000007FF000007FF000007FF000003FF000003F
+F000003FF800003FF800001FF800001FF800001FF800001FF800000FFC00000FFC00000F
+FC000007FC000007FE000007FE000003FE000003FF000001FF000001FF000000FF800000
+FF8000007F8000007FC000003FC000003FE000001FE000001FF000000FF0000007F80000
+07F8000003FC000001FC000000FE000000FF0000007F0000003F8000001FC000000FE000
+0007E0000003F0000001F8000000FC0000003E0000001E1F7974D933>40
+D<F0000000F80000007E0000003F0000001F8000000FC000000FE0000007F0000003F800
+0001FC000001FE000000FE0000007F0000007F8000003FC000003FC000001FE000001FF0
+00000FF000000FF8000007F8000007FC000003FC000003FE000003FE000001FF000001FF
+000001FF800000FF800000FFC00000FFC000007FC000007FE000007FE000007FE000003F
+F000003FF000003FF000003FF000003FF800003FF800001FF800001FF800001FFC00001F
+FC00001FFC00001FFC00001FFC00001FFC00000FFC00000FFE00000FFE00000FFE00000F
+FE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000F
+FE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000FFE00000F
+FC00001FFC00001FFC00001FFC00001FFC00001FFC00001FFC00001FF800001FF800003F
+F800003FF800003FF000003FF000003FF000003FF000007FE000007FE000007FE000007F
+C00000FFC00000FFC00000FF800001FF800001FF000001FF000003FE000003FE000003FC
+000007FC000007F800000FF800000FF000001FF000001FE000003FC000003FC000007F80
+00007F000000FE000001FE000001FC000003F8000007F000000FE000000FC000001F8000
+003F0000007E000000F8000000F00000001F7979D933>I<07E0001FF0003FFC007FFC00
+7FFE00FFFF00FFFF00FFFF00FFFF80FFFF80FFFF807FFF807FFF803FFF801FFF8007E780
+000780000780000780000F80000F00000F00000F00001F00001E00003E00003E00007C00
+007C0000F80000F80001F00003E00007E0000FC0001F80001F00001E00000C0000112776
+8F25>44 D<000003FF80000000003FFFF800000001FFFFFF00000007FFFFFFC000000FFF
+01FFE000003FFC007FF800007FF0001FFC0000FFE0000FFE0001FFC00007FF0001FF8000
+03FF0003FF800003FF8007FF000001FFC007FF000001FFC00FFE000000FFE00FFE000000
+FFE01FFE000000FFF01FFE000000FFF01FFE000000FFF03FFE000000FFF83FFE000000FF
+F83FFC0000007FF83FFC0000007FF87FFC0000007FFC7FFC0000007FFC7FFC0000007FFC
+7FFC0000007FFC7FFC0000007FFC7FFC0000007FFCFFFC0000007FFEFFFC0000007FFEFF
+FC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC
+0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC00
+00007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000
+007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC0000007FFEFFFC000000
+7FFE7FFC0000007FFC7FFC0000007FFC7FFC0000007FFC7FFC0000007FFC7FFC0000007F
+FC7FFC0000007FFC3FFC0000007FF83FFE000000FFF83FFE000000FFF83FFE000000FFF8
+1FFE000000FFF01FFE000000FFF01FFE000000FFF00FFE000000FFE00FFF000001FFE007
+FF000001FFC007FF000001FFC003FF800003FF8001FF800003FF0001FFC00007FF0000FF
+E0000FFE00007FF0001FFC00003FFC007FF800000FFF01FFE0000007FFFFFFC0000001FF
+FFFF000000003FFFF80000000003FF800000374F7BCD42>48 D<0000001E00000000003E
+0000000000FE0000000003FE000000000FFE000000007FFE00000007FFFE000003FFFFFE
+0000FFFFFFFE0000FFFFFFFE0000FFFFFFFE0000FFF87FFE0000FC007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE
+000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE00007FFFFFFF
+FFFC7FFFFFFFFFFC7FFFFFFFFFFC7FFFFFFFFFFC7FFFFFFFFFFC2E4E76CD42>I<00001F
+FE0000000001FFFFF00000000FFFFFFC0000003FFFFFFF8000007FFFFFFFE00001FF803F
+FFF00003FC0007FFFC0007F00001FFFE000FE00000FFFF001F8000007FFF803F0000003F
+FF803F0000001FFFC07FE000001FFFE07FF800000FFFE07FFC00000FFFF0FFFC000007FF
+F0FFFE000007FFF0FFFE000003FFF8FFFE000003FFF8FFFE000003FFF8FFFE000003FFF8
+FFFE000003FFF87FFC000003FFF87FFC000003FFF83FF8000003FFF81FF0000003FFF803
+80000003FFF80000000003FFF00000000007FFF00000000007FFF00000000007FFE00000
+00000FFFE0000000000FFFC0000000001FFFC0000000001FFF80000000003FFF00000000
+003FFE00000000007FFC0000000000FFF80000000000FFF00000000001FFE00000000003
+FFC00000000007FF800000000007FF00000000000FFC00000000001FF800000000003FF0
+00000000007FC00000000000FF800000000001FF000000000003FC000000000007F80000
+0000000FF00000F800001FE00000F800003FC00000F800007F000000F80000FE000001F0
+0001FC000001F00003F8000001F00007F0000001F00007E0000001F0000F80000003F000
+1F00000003F0003E00000007F0007FFFFFFFFFF000FFFFFFFFFFE001FFFFFFFFFFE003FF
+FFFFFFFFE007FFFFFFFFFFE00FFFFFFFFFFFE01FFFFFFFFFFFE03FFFFFFFFFFFE07FFFFF
+FFFFFFE0FFFFFFFFFFFFE0FFFFFFFFFFFFC0FFFFFFFFFFFFC0FFFFFFFFFFFFC0FFFFFFFF
+FFFFC0354E7ACD42>I<000007FFC0000000007FFFFC00000003FFFFFF8000000FFFFFFF
+E000001FF803FFF800007FC000FFFC0000FE00003FFE0001FC00003FFF0003F800001FFF
+8003FE00001FFF8007FF80000FFFC007FFC0000FFFC00FFFC0000FFFE00FFFE0000FFFE0
+0FFFE0000FFFE00FFFE0000FFFE00FFFE0000FFFE00FFFE0000FFFE00FFFE0000FFFE007
+FFC0000FFFE007FFC0000FFFC003FF80000FFFC001FF00001FFFC0003800001FFF800000
+00001FFF80000000003FFF00000000003FFF00000000007FFE00000000007FFC00000000
+00FFF80000000001FFF00000000003FFC0000000000FFF80000000007FFE000000007FFF
+F8000000007FFFC0000000007FFFFC000000007FFFFF800000000003FFE000000000007F
+F800000000003FFE00000000001FFF00000000000FFF80000000000FFFC00000000007FF
+E00000000007FFF00000000003FFF80000000003FFF80000000003FFFC0000000001FFFC
+0000000001FFFC0000000001FFFE0000000001FFFE0000000001FFFE03C0000001FFFE0F
+F0000001FFFE3FFC000001FFFE7FFE000001FFFE7FFE000001FFFEFFFF000001FFFEFFFF
+000001FFFEFFFF000001FFFCFFFF000001FFFCFFFF000003FFFCFFFF000003FFF8FFFF00
+0003FFF87FFE000003FFF07FFC000007FFF07FF8000007FFE03FE000000FFFC01FC00000
+1FFFC00FF000003FFF8007FE00007FFE0003FFE003FFFC0001FFFFFFFFF800007FFFFFFF
+E000000FFFFFFF00000001FFFFFC000000001FFF800000374F7BCD42>I<0000000000FC
+00000000000001FC00000000000001FC00000000000003FC00000000000007FC00000000
+00000FFC0000000000000FFC0000000000001FFC0000000000003FFC0000000000007FFC
+0000000000007FFC000000000000FFFC000000000001FFFC000000000003FFFC00000000
+0003FFFC000000000007FFFC00000000000FFFFC00000000001FFFFC00000000001F7FFC
+00000000003E7FFC00000000007E7FFC0000000000FC7FFC0000000000F87FFC00000000
+01F07FFC0000000003F07FFC0000000007E07FFC0000000007C07FFC000000000F807FFC
+000000001F807FFC000000003F007FFC000000003E007FFC000000007C007FFC00000000
+FC007FFC00000001F8007FFC00000001F0007FFC00000003E0007FFC00000007E0007FFC
+0000000FC0007FFC0000000F80007FFC0000001F00007FFC0000003F00007FFC0000007E
+00007FFC0000007C00007FFC000000F800007FFC000001F800007FFC000003F000007FFC
+000003E000007FFC000007C000007FFC00000FC000007FFC00001F8000007FFC00001F00
+00007FFC00003E0000007FFC00007E0000007FFC0000FC0000007FFC0000FFFFFFFFFFFF
+FF80FFFFFFFFFFFFFF80FFFFFFFFFFFFFF80FFFFFFFFFFFFFF80FFFFFFFFFFFFFF800000
+0000FFFC000000000000FFFC000000000000FFFC000000000000FFFC000000000000FFFC
+000000000000FFFC000000000000FFFC000000000000FFFC000000000000FFFC00000000
+0000FFFC000000000000FFFC000000000000FFFC000000000000FFFC000000000000FFFC
+000000000000FFFC000000001FFFFFFFFF8000001FFFFFFFFF8000001FFFFFFFFF800000
+1FFFFFFFFF8000001FFFFFFFFF80394F7CCE42>I<0180000000060001F00000003E0001
+FE000001FE0001FFF0003FFE0001FFFFFFFFFC0001FFFFFFFFF80001FFFFFFFFF00001FF
+FFFFFFE00001FFFFFFFFC00001FFFFFFFF800001FFFFFFFF000001FFFFFFFC000001FFFF
+FFF8000001FFFFFFE0000001FFFFFF00000001FFFFFC00000001F0FF8000000001F00000
+00000001F0000000000001F0000000000001F0000000000001F0000000000001F0000000
+000001F0000000000001F0000000000001F0000000000001F0000000000001F000000000
+0001F0000000000001F007FF80000001F03FFFF8000001F0FFFFFE000001F3FFFFFF8000
+01FFFC01FFE00001FFE0007FF80001FF00003FFC0001FE00001FFE0001F800000FFF0001
+F000000FFF0001F0000007FF8001E0000007FFC00000000007FFC00000000007FFE00000
+000003FFE00000000003FFF00000000003FFF00000000003FFF00000000003FFF0000000
+0003FFF80000000003FFF80000000003FFF80300000003FFF80FE0000003FFF83FF80000
+03FFF87FFC000003FFF87FFC000003FFF8FFFC000003FFF8FFFE000003FFF8FFFE000003
+FFF8FFFE000003FFF0FFFE000003FFF0FFFC000003FFF0FFFC000007FFF07FF8000007FF
+E07FF0000007FFE07FC0000007FFC03F0000000FFFC03F0000000FFF801F8000001FFF00
+1FC000001FFF000FF000003FFE0007F80000FFFC0003FE0001FFF00001FFE00FFFE00000
+7FFFFFFF8000003FFFFFFF0000000FFFFFF800000001FFFFC0000000003FFC000000354F
+7ACD42>I<00000007FE0000000000FFFFC000000003FFFFF00000001FFFFFFC0000007F
+FC01FE000000FFE0007F000003FF80003F800007FF00001F80000FFE00007FC0001FFC00
+00FFC0003FF80003FFE0007FF00003FFE000FFE00007FFE001FFE00007FFE003FFC00007
+FFE003FFC00007FFE007FF800007FFE007FF800007FFE00FFF800003FFC00FFF000003FF
+C01FFF000000FF001FFF0000007E001FFF00000000003FFF00000000003FFF0000000000
+3FFE00000000007FFE00000000007FFE00000000007FFE003FF000007FFE01FFFF00007F
+FE07FFFFC000FFFE0FFFFFF000FFFE1F807FF800FFFE3E001FFE00FFFE78000FFF00FFFE
+F00007FF80FFFEF00003FFC0FFFFE00003FFC0FFFFC00001FFE0FFFFC00001FFF0FFFF80
+0001FFF0FFFF800000FFF8FFFF800000FFF8FFFF000000FFFCFFFF000000FFFCFFFF0000
+00FFFCFFFF000000FFFCFFFE000000FFFEFFFE000000FFFEFFFE000000FFFE7FFE000000
+FFFE7FFE000000FFFE7FFE000000FFFE7FFE000000FFFE7FFE000000FFFE7FFE000000FF
+FE3FFE000000FFFE3FFE000000FFFE3FFE000000FFFE3FFF000000FFFE1FFF000000FFFC
+1FFF000000FFFC1FFF000000FFFC0FFF000000FFF80FFF000001FFF807FF000001FFF807
+FF800001FFF003FF800001FFE001FFC00003FFE001FFE00003FFC000FFE00007FF80007F
+F0000FFF00003FFC001FFE00001FFF00FFFC000007FFFFFFF0000003FFFFFFE0000000FF
+FFFF800000001FFFFC0000000003FFC00000374F7BCD42>I<1F0000000000001F800000
+0000001FC000000000001FFF80000000001FFFFFFFFFFFFF1FFFFFFFFFFFFF1FFFFFFFFF
+FFFF1FFFFFFFFFFFFF3FFFFFFFFFFFFF3FFFFFFFFFFFFE3FFFFFFFFFFFFC3FFFFFFFFFFF
+F83FFFFFFFFFFFF03FFFFFFFFFFFF03FFFFFFFFFFFE03FFFFFFFFFFFC03FFFFFFFFFFF80
+7FFFFFFFFFFF007F800000003E007E000000007E007E00000000FC007C00000001F8007C
+00000003F0007C00000003E0007C00000007E0007C0000000FC000F80000001F8000F800
+00003F0000F80000007E0000F80000007C000000000000FC000000000001F80000000000
+03F0000000000003F0000000000007E000000000000FE000000000001FC000000000001F
+C000000000003F8000000000003F8000000000007F000000000000FF000000000000FF00
+0000000001FF000000000001FE000000000003FE000000000003FE000000000007FE0000
+00000007FC00000000000FFC00000000000FFC00000000000FFC00000000001FFC000000
+00001FFC00000000003FFC00000000003FFC00000000003FFC00000000007FF800000000
+007FF800000000007FF800000000007FF80000000000FFF80000000000FFF80000000000
+FFF80000000000FFF80000000000FFF80000000000FFF80000000001FFF80000000001FF
+F80000000001FFF80000000001FFF80000000001FFF80000000001FFF80000000001FFF8
+0000000001FFF80000000001FFF80000000001FFF80000000001FFF80000000000FFF000
+000000007FE000000000003FC000000000001F80000000385279D042>I<000003FFC000
+0000003FFFFC00000001FFFFFF80000007FFFFFFE000000FFC00FFF800003FE0001FFC00
+007F800007FE0000FF000003FF0000FE000001FF8001FC000000FF8003FC000000FFC003
+F80000007FC007F80000007FC007F80000007FE007F80000003FE00FF80000003FE00FF8
+0000003FE00FFC0000003FE00FFC0000003FE00FFE0000003FE00FFF0000003FE00FFF80
+00007FE00FFFE000007FC00FFFF000007FC00FFFFC0000FFC007FFFF0000FF8007FFFF80
+01FF0007FFFFE003FF0003FFFFF807FE0003FFFFFC0FFC0001FFFFFF1FF00000FFFFFFFF
+E00000FFFFFFFF8000007FFFFFFE0000003FFFFFFE0000000FFFFFFF80000007FFFFFFC0
+000001FFFFFFF0000000FFFFFFF8000003FFFFFFFE00000FFFFFFFFF00003FF7FFFFFF80
+007FC1FFFFFFC001FF807FFFFFE003FF001FFFFFE007FE000FFFFFF00FFC0003FFFFF81F
+F80000FFFFF81FF000007FFFFC3FF000001FFFFC3FE0000007FFFC7FE0000003FFFE7FC0
+000000FFFE7FC00000007FFEFFC00000003FFEFF800000001FFEFF800000000FFEFF8000
+000007FEFF8000000007FEFF8000000003FEFF8000000003FEFF8000000003FCFF800000
+0003FCFFC000000003FC7FC000000003FC7FE000000007F87FE000000007F83FF0000000
+0FF03FF80000000FF01FFC0000001FE00FFE0000003FC007FF000000FF8003FFC00003FF
+0001FFFC003FFE00007FFFFFFFF800001FFFFFFFE0000007FFFFFF80000000FFFFFC0000
+00000FFFC00000374F7BCD42>I<000007FF80000000007FFFF800000001FFFFFE000000
+07FFFFFF8000001FFE01FFE000007FF8003FF00000FFF0001FF80001FFE0000FFC0003FF
+C00007FE0007FF800007FF000FFF800003FF800FFF000003FF801FFF000001FFC03FFF00
+0001FFC03FFF000001FFE07FFE000001FFE07FFE000001FFF07FFE000001FFF07FFE0000
+00FFF8FFFE000000FFF8FFFE000000FFF8FFFE000000FFF8FFFE000000FFFCFFFE000000
+FFFCFFFE000000FFFCFFFE000000FFFCFFFE000000FFFCFFFE000000FFFCFFFE000000FF
+FEFFFE000000FFFEFFFE000000FFFEFFFE000001FFFE7FFE000001FFFE7FFE000001FFFE
+7FFE000001FFFE7FFE000001FFFE3FFE000003FFFE3FFE000003FFFE1FFF000003FFFE1F
+FF000007FFFE0FFF000007FFFE07FF80000FFFFE07FF80001EFFFE03FFC0001EFFFE01FF
+E0003CFFFE007FF000F8FFFE003FFC03F0FFFE001FFFFFE0FFFE0007FFFFC0FFFC0000FF
+FF00FFFC00001FF800FFFC0000000000FFFC0000000000FFFC0000000000FFF800000000
+01FFF80000000001FFF80000000001FFF800FC000001FFF001FE000001FFF007FF800001
+FFE007FF800003FFE00FFFC00003FFC00FFFC00003FFC00FFFC00007FF800FFFC00007FF
+800FFFC0000FFF000FFFC0000FFE000FFF80001FFE0007FF80003FFC0007FE00007FF800
+07FC0000FFF00003F80001FFE00003FC0007FFC00001FF803FFF000000FFFFFFFC000000
+3FFFFFF80000001FFFFFC000000007FFFF00000000007FF0000000374F7BCD42>I<FFFF
+FFFFFFFFFFFFFE00FFFFFFFFFFFFFFFFFE00FFFFFFFFFFFFFFFFFE00FFFFFFFFFFFFFFFF
+FE00FFFFFFFFFFFFFFFFFE00000FFFE0000007FFFF00000FFFE00000007FFF00000FFFE0
+0000001FFF00000FFFE000000007FF00000FFFE000000003FF00000FFFE000000001FF00
+000FFFE000000000FF00000FFFE0000000007F00000FFFE0000000007F00000FFFE00000
+00003F80000FFFE0000000003F80000FFFE0000000001F80000FFFE0000000001F80000F
+FFE0000000001F80000FFFE0000000000F80000FFFE0000000000F80000FFFE000000000
+0F80000FFFE0000000000F80000FFFE00001F0000FC0000FFFE00001F00007C0000FFFE0
+0001F00007C0000FFFE00001F00007C0000FFFE00001F00007C0000FFFE00001F0000000
+000FFFE00001F0000000000FFFE00003F0000000000FFFE00003F0000000000FFFE00003
+F0000000000FFFE00007F0000000000FFFE0000FF0000000000FFFE0001FF0000000000F
+FFE000FFF0000000000FFFFFFFFFF0000000000FFFFFFFFFF0000000000FFFFFFFFFF000
+0000000FFFFFFFFFF0000000000FFFFFFFFFF0000000000FFFE000FFF0000000000FFFE0
+001FF0000000000FFFE0000FF0000000000FFFE00007F0000000000FFFE00003F0000000
+000FFFE00003F0000000000FFFE00003F0000000000FFFE00001F0000000000FFFE00001
+F00000F8000FFFE00001F00000F8000FFFE00001F00000F8000FFFE00001F00001F0000F
+FFE00001F00001F0000FFFE00001F00001F0000FFFE00000000001F0000FFFE000000000
+01F0000FFFE00000000003F0000FFFE00000000003F0000FFFE00000000003E0000FFFE0
+0000000003E0000FFFE00000000007E0000FFFE00000000007E0000FFFE00000000007E0
+000FFFE0000000000FE0000FFFE0000000000FC0000FFFE0000000001FC0000FFFE00000
+00003FC0000FFFE0000000003FC0000FFFE0000000007FC0000FFFE000000000FFC0000F
+FFE000000001FF80000FFFE000000007FF80000FFFE00000001FFF80000FFFE00000007F
+FF80000FFFE000000FFFFF80FFFFFFFFFFFFFFFFFF80FFFFFFFFFFFFFFFFFF80FFFFFFFF
+FFFFFFFFFF00FFFFFFFFFFFFFFFFFF00FFFFFFFFFFFFFFFFFF004D527CD156>69
+D<FFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFF
+FCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFC0007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFFFFFFFFFFFFFFF80000007FFFFFFFFFFFFFFFF80
+000007FFFFFFFFFFFFFFFF80000007FFFFFFFFFFFFFFFF80000007FFFFFFFFFFFFFFFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF8000FFFFFFFFFF8007FFFFFFFF
+FCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFF
+FCFFFFFFFFFF8007FFFFFFFFFC5E527CD167>72 D<FFFFFFFFFF80FFFFFFFFFF80FFFFFF
+FFFF80FFFFFFFFFF80FFFFFFFFFF800007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF000000007FFF000000007FFF000000007FFF000000007FF
+F000000007FFF000000007FFF00000FFFFFFFFFF80FFFFFFFFFF80FFFFFFFFFF80FFFFFF
+FFFF80FFFFFFFFFF8029527DD130>I<FFFFFFFFFFE0000000FFFFFFFFFFE0000000FFFF
+FFFFFFE0000000FFFFFFFFFFE0000000FFFFFFFFFFE0000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE00000000000000FFFE00000000000000FFFE00000000000000FFFE00000000000000F
+FFE000000000F8000FFFE000000000F8000FFFE000000000F8000FFFE000000000F8000F
+FFE000000001F8000FFFE000000001F0000FFFE000000001F0000FFFE000000001F0000F
+FFE000000001F0000FFFE000000001F0000FFFE000000003F0000FFFE000000003F0000F
+FFE000000003F0000FFFE000000007F0000FFFE000000007F0000FFFE00000000FF0000F
+FFE00000000FE0000FFFE00000001FE0000FFFE00000001FE0000FFFE00000003FE0000F
+FFE00000007FE0000FFFE0000000FFE0000FFFE0000001FFE0000FFFE0000007FFE0000F
+FFE000000FFFE0000FFFE000007FFFE0000FFFE00003FFFFE0FFFFFFFFFFFFFFFFC0FFFF
+FFFFFFFFFFFFC0FFFFFFFFFFFFFFFFC0FFFFFFFFFFFFFFFFC0FFFFFFFFFFFFFFFFC04552
+7CD14F>76 D<00003FFE000000000007FFFFE0000000001FFFFFFC000000007FFFFFFF00
+000001FFC00FFFC0000003FE0003FFE0000007FF0000FFF0000007FF80007FF800000FFF
+C0007FFC00000FFFC0003FFE00000FFFC0003FFE00000FFFC0001FFF00000FFFC0001FFF
+00000FFFC0001FFF00000FFFC0000FFF800007FF80000FFF800003FF00000FFF800001FE
+00000FFF8000000000000FFF8000000000000FFF8000000000000FFF8000000000000FFF
+8000000000000FFF8000000000000FFF800000000007FFFF8000000003FFFFFF80000000
+7FFFFFFF80000003FFFFFFFF8000001FFFF00FFF8000007FFF000FFF800000FFFC000FFF
+800003FFF0000FFF800007FFC0000FFF80000FFF80000FFF80001FFF00000FFF80003FFF
+00000FFF80003FFE00000FFF80007FFC00000FFF80007FFC00000FFF81F0FFFC00000FFF
+81F0FFF800000FFF81F0FFF800000FFF81F0FFF800000FFF81F0FFF800001FFF81F0FFF8
+00001FFF81F0FFFC00003FFF81F07FFC00003FFF81F07FFE00007FFF81F03FFE0000F7FF
+C3F03FFF0001E3FFC3E01FFFC007E3FFFFE007FFF01F81FFFFC003FFFFFF00FFFF8000FF
+FFFC007FFF00001FFFF0003FFC000001FF800007F0003C387CB642>97
+D<000003FFE0000000003FFFFE00000000FFFFFF80000003FFFFFFE000000FFF003FF800
+003FFC0007FC00007FF8000FFE0000FFF0001FFE0001FFE0003FFF0003FFC0003FFF0007
+FF80003FFF0007FF80003FFF000FFF00003FFF001FFF00003FFF001FFE00003FFF003FFE
+00001FFE003FFE00000FFC003FFE000007F8007FFE00000000007FFC00000000007FFC00
+000000007FFC0000000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC0000
+000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC000000
+0000FFFC0000000000FFFC0000000000FFFC0000000000FFFC00000000007FFC00000000
+007FFE00000000007FFE00000000007FFE00000000003FFE00000000003FFF0000000000
+1FFF0000000F801FFF0000000F800FFF8000001F800FFF8000001F0007FFC000003F0003
+FFE000003E0001FFF000007E0000FFF80000FC00007FFC0001F800003FFF0007F000000F
+FFC01FE0000007FFFFFF80000001FFFFFE000000003FFFF80000000003FF80000031387C
+B63A>99 D<0000001FF800000003FFFE0000000FFFFF8000003FFFFFC00000FFF83FE000
+03FFE0FFF00007FF80FFF0000FFF01FFF8001FFF01FFF8003FFE01FFF8003FFE01FFF800
+7FFC01FFF8007FFC01FFF8007FFC00FFF000FFF800FFF000FFF8007FE000FFF8001F8000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF8000000FFFFFFFFC000FFFFFFFFC000FFFFFFFFC000FFFFFFFFC000FF
+FFFFFFC00000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000FFF800000000
+FFF800000000FFF8000000FFFFFFFE0000FFFFFFFE0000FFFFFFFE0000FFFFFFFE0000FF
+FFFFFE00002D547CD328>102 D<003F000000FFC00001FFE00003FFF00003FFF00007FF
+F80007FFF80007FFF80007FFF80007FFF80007FFF80003FFF00003FFF00001FFE00000FF
+C000003F0000000000000000000000000000000000000000000000000000000000000000
+0000000000000000000000000000000000000000000000000000001FF800FFFFF800FFFF
+F800FFFFF800FFFFF800FFFFF80001FFF80000FFF80000FFF80000FFF80000FFF80000FF
+F80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FF
+F80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FF
+F80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FF
+F80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FFF80000FF
+F80000FFF800FFFFFFF0FFFFFFF0FFFFFFF0FFFFFFF0FFFFFFF01C547CD324>105
+D<003FF0001FF8000001FF800000FFFFF000FFFF80000FFFF80000FFFFF003FFFFE0003F
+FFFE0000FFFFF00FFFFFF000FFFFFF0000FFFFF03F80FFF803F80FFF8000FFFFF07E007F
+FC07E007FFC00003FFF0F8003FFE0F8003FFE00000FFF1F0001FFE1F0001FFE00000FFF3
+E0001FFF3E0001FFF00000FFF3C0001FFF3C0001FFF00000FFF780001FFF780001FFF000
+00FFF700000FFFF00000FFF80000FFFF00000FFFF00000FFF80000FFFE00000FFFE00000
+FFF80000FFFE00000FFFE00000FFF80000FFFC00000FFFC00000FFF80000FFFC00000FFF
+C00000FFF80000FFFC00000FFFC00000FFF80000FFF800000FFF800000FFF80000FFF800
+000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000
+FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FF
+F80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF80
+0000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF80000
+0FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FF
+F800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF8
+0000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF8000
+00FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000F
+FF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF80000FFF8
+00000FFF800000FFF80000FFF800000FFF800000FFF80000FFF800000FFF800000FFF800
+00FFF800000FFF800000FFF80000FFF800000FFF800000FFF800FFFFFFF80FFFFFFF80FF
+FFFFF8FFFFFFF80FFFFFFF80FFFFFFF8FFFFFFF80FFFFFFF80FFFFFFF8FFFFFFF80FFFFF
+FF80FFFFFFF8FFFFFFF80FFFFFFF80FFFFFFF865367BB56E>109
+D<003FF0001FFC000000FFFFF000FFFF800000FFFFF003FFFFE00000FFFFF00FFFFFF800
+00FFFFF01FC07FFC0000FFFFF07E003FFE000003FFF0F8001FFF000000FFF1F0001FFF00
+0000FFF1E0000FFF800000FFF3C0000FFF800000FFF780000FFF800000FFF7000007FFC0
+0000FFFF000007FFC00000FFFE000007FFC00000FFFE000007FFC00000FFFC000007FFC0
+0000FFFC000007FFC00000FFFC000007FFC00000FFFC000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC0
+0000FFF8000007FFC000FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFF
+C0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC042367CB549>I<000001FFC00000000000
+3FFFFE0000000000FFFFFF8000000003FFFFFFE00000000FFF80FFF80000003FFC001FFE
+0000007FF00007FF000000FFE00003FF800001FFC00001FFC00003FF800000FFE00003FF
+0000007FE00007FF0000007FF0000FFF0000007FF8000FFE0000003FF8001FFE0000003F
+FC001FFE0000003FFC003FFE0000003FFE003FFC0000001FFE003FFC0000001FFE007FFC
+0000001FFF007FFC0000001FFF007FFC0000001FFF007FFC0000001FFF00FFFC0000001F
+FF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC
+0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001F
+FF80FFFC0000001FFF80FFFC0000001FFF807FFC0000001FFF007FFC0000001FFF007FFC
+0000001FFF003FFC0000001FFE003FFE0000003FFE003FFE0000003FFE001FFE0000003F
+FC001FFE0000003FFC000FFF0000007FF8000FFF0000007FF80007FF800000FFF00003FF
+800000FFE00001FFC00001FFC00000FFE00003FF8000007FF00007FF0000003FFC001FFE
+0000001FFF80FFFC00000007FFFFFFF000000001FFFFFFC0000000003FFFFE0000000000
+03FFE000000039387CB642>I<003FF8007FF0000000FFFFF807FFFF000000FFFFF81FFF
+FFC00000FFFFF87FFFFFF00000FFFFF9FF00FFFC0000FFFFFFF8003FFF000003FFFFE000
+0FFF800000FFFF800007FFC00000FFFF000003FFE00000FFFE000003FFF00000FFFC0000
+01FFF00000FFF8000000FFF80000FFF8000000FFFC0000FFF80000007FFC0000FFF80000
+007FFE0000FFF80000007FFE0000FFF80000003FFE0000FFF80000003FFF0000FFF80000
+003FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF80000001FFF8000FFF80000
+001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000
+001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000
+001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000
+003FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF80000
+007FFE0000FFF80000007FFE0000FFF80000007FFC0000FFF8000000FFFC0000FFF80000
+00FFF80000FFFC000001FFF80000FFFC000001FFF00000FFFE000003FFE00000FFFF0000
+07FFC00000FFFF80000FFF800000FFFFE0001FFF000000FFFFF0007FFE000000FFF9FE01
+FFF8000000FFF8FFFFFFF0000000FFF83FFFFFC0000000FFF807FFFE00000000FFF800FF
+E000000000FFF800000000000000FFF800000000000000FFF800000000000000FFF80000
+0000000000FFF800000000000000FFF800000000000000FFF800000000000000FFF80000
+0000000000FFF800000000000000FFF800000000000000FFF800000000000000FFF80000
+0000000000FFF800000000000000FFF800000000000000FFF800000000000000FFF80000
+0000000000FFF8000000000000FFFFFFF80000000000FFFFFFF80000000000FFFFFFF800
+00000000FFFFFFF80000000000FFFFFFF80000000000414D7DB549>I<0003FFC00E0000
+1FFFFC1E0000FFFFFF7E0003FFFFFFFE0007FE003FFE000FF0000FFE001FE00003FE003F
+C00001FE003F800000FE007F800000FE007F0000007E007F0000007E00FF0000003E00FF
+0000003E00FF8000003E00FF8000003E00FFC000003E00FFF000000000FFFC00000000FF
+FF800000007FFFFE0000007FFFFFF000003FFFFFFE00003FFFFFFF80001FFFFFFFE0000F
+FFFFFFF00007FFFFFFFC0003FFFFFFFE0000FFFFFFFF00003FFFFFFF00000FFFFFFF8000
+01FFFFFF8000000FFFFFC00000003FFFC000000007FFE000000001FFE0F8000000FFE0F8
+0000007FE0FC0000003FE0FC0000003FE0FC0000001FE0FE0000001FE0FE0000001FE0FE
+0000001FC0FF0000001FC0FF8000003FC0FF8000003F80FFC000003F80FFE000007F00FF
+F80000FF00FFFC0003FE00FFFF801FFC00FE7FFFFFF000F81FFFFFC000F007FFFF0000E0
+007FF000002B387CB634>115 D<FFFFFFFFFFFFFFFFFC00FFFFFFFFFFFFFFFFFC00FFFF
+FFFFFFFFFFFFFC00FFFFFFFFFFFFFFFFFC00FFFFFFFFFFFFFFFFFC00000FFFC000000FFF
+FE00000FFFC0000000FFFE00000FFFC00000003FFE00000FFFC00000000FFE00000FFFC0
+00000007FE00000FFFC000000003FE00000FFFC000000001FE00000FFFC000000000FE00
+000FFFC000000000FE00000FFFC0000000007F00000FFFC0000000007F00000FFFC00000
+00003F00000FFFC0000000003F00000FFFC0000000003F00000FFFC0000000001F00000F
+FFC0000000001F00000FFFC0000000001F00000FFFC0000000001F00000FFFC000000000
+1F80000FFFC0000000000F80000FFFC0000000000F80000FFFC0000000000F80000FFFC0
+000000000F80000FFFC0000000000000000FFFC0000000000000000FFFC0000000000000
+000FFFC0000000000000000FFFC0000000000000000FFFC0000000000000000FFFC00000
+80000000000FFFC07FFFFFE00000000FFFFFFFFFFFFE0000000FFFFFFFFFFFFF8000000F
+FFFFFFFFFFFFE000000FFFFFFFFFFFFFF800000FFFFFE0007FFFFE00000FFFE0000007FF
+FF00000FFFC0000001FFFF80000FFFC00000007FFFC0000FFFC00000003FFFE0000FFFC0
+0000001FFFF0000FFFC00000000FFFF8000FFFC000000007FFF8000FFFC000000007FFFC
+000FFFC000000003FFFC000FFFC000000003FFFE000FFFC000000001FFFE000FFFC00000
+0001FFFE000FFFC000000001FFFE000FFFC000000000FFFF000FFFC000000000FFFF000F
+FFC000000000FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFFC000000000
+FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFFC0
+00000000FFFE000FFFC000000001FFFE000FFFC000000001FFFE000FFFC000000001FFFE
+000FFFC000000003FFFC000FFFC000000003FFFC000FFFC000000007FFF8000FFFC00000
+0007FFF8000FFFC00000000FFFF0000FFFC00000001FFFE0000FFFC00000003FFFC0000F
+FFC00000007FFF80000FFFC0000001FFFF00000FFFC000000FFFFE00FFFFFFFFFFFFFFFF
+F800FFFFFFFFFFFFFFFFF000FFFFFFFFFFFFFFFF8000FFFFFFFFFFFFFFFE0000FFFFFFFF
+FFFFFFC0000050527BD15D>193 D<FFFFFFFFFFFFFE000000FFFFFFFFFFFFFFF00000FF
+FFFFFFFFFFFFFE0000FFFFFFFFFFFFFFFF8000FFFFFFFFFFFFFFFFE000000FFFC000001F
+FFF000000FFFC0000003FFF800000FFFC0000001FFFC00000FFFC00000007FFE00000FFF
+C00000007FFF00000FFFC00000003FFF80000FFFC00000001FFFC0000FFFC00000001FFF
+C0000FFFC00000000FFFE0000FFFC00000000FFFE0000FFFC00000000FFFE0000FFFC000
+000007FFF0000FFFC000000007FFF0000FFFC000000007FFF0000FFFC000000007FFF000
+0FFFC000000007FFF0000FFFC000000007FFF0000FFFC000000007FFF0000FFFC0000000
+07FFF0000FFFC000000007FFF0000FFFC00000000FFFE0000FFFC00000000FFFE0000FFF
+C00000000FFFE0000FFFC00000001FFFC0000FFFC00000001FFF80000FFFC00000003FFF
+80000FFFC00000007FFF00000FFFC00000007FFE00000FFFC0000000FFFC00000FFFC000
+0003FFF800000FFFC0000007FFE000000FFFC000003FFFC000000FFFFFFFFFFFFF000000
+0FFFFFFFFFFFF80000000FFFFFFFFFFFF80000000FFFFFFFFFFFFF8000000FFFC000001F
+FFE000000FFFC0000001FFF800000FFFC00000007FFE00000FFFC00000003FFF00000FFF
+C00000000FFFC0000FFFC00000000FFFE0000FFFC000000007FFF0000FFFC000000003FF
+F0000FFFC000000003FFF8000FFFC000000001FFFC000FFFC000000001FFFC000FFFC000
+000000FFFE000FFFC000000000FFFE000FFFC000000000FFFE000FFFC000000000FFFF00
+0FFFC000000000FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFFC0000000
+00FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFFC000000000FFFF000FFF
+C000000000FFFF000FFFC000000000FFFE000FFFC000000000FFFE000FFFC000000001FF
+FE000FFFC000000001FFFC000FFFC000000001FFFC000FFFC000000003FFFC000FFFC000
+000007FFF8000FFFC000000007FFF0000FFFC00000000FFFF0000FFFC00000001FFFE000
+0FFFC00000007FFFC0000FFFC0000001FFFF80000FFFC000000FFFFE00FFFFFFFFFFFFFF
+FFFC00FFFFFFFFFFFFFFFFF000FFFFFFFFFFFFFFFFC000FFFFFFFFFFFFFFFE0000FFFFFF
+FFFFFFFFC0000050527BD15D>I<3800003FFF000000003C0007FFFFF80000003F003FFF
+FFFF8000003F80FFFFFFFFE000003FE3FFFFFFFFF800003FF7FFC007FFFE00003FFFFC00
+00FFFF00003FFFE000003FFF80003FFF8000001FFFE0003FFF0000000FFFE0003FFC0000
+0007FFF0003FF800000003FFF8003FF000000001FFFC003FE000000001FFFC003FE00000
+0000FFFE003FC000000000FFFE003FC000000000FFFE003F8000000000FFFF003F800000
+00007FFF003F00000000007FFF003F00000000007FFF003F00000000007FFF003E000000
+00007FFF003E00000000007FFF003E00000000007FFF003E0000000000FFFF0000000000
+0000FFFE00000000000000FFFE00000000000001FFFC00000000000001FFFC0000000000
+0003FFF800000000000003FFF000000000000007FFE00000000000000FFFC00000000000
+001FFF800000000000003FFE00000000000000FFF800000000000007FFE0000000000FFF
+FFFF80000000001FFFFFFC00000000001FFFFFF800000000001FFFFFFF80000000000000
+1FFFF000000000000000FFFE000000000000001FFF8000000000000007FFE00000000000
+0003FFF000000000000001FFF800000000000000FFFE000000000000007FFF0000000000
+00003FFF000000000000003FFF800000000000001FFFC00000000000001FFFC000000000
+00001FFFE00000000000000FFFE00000000000000FFFF00000000000000FFFF000000000
+00000FFFF0F800000000000FFFF0F800000000000FFFF0F800000000000FFFF0F8000000
+00000FFFF0F800000000000FFFF0FC00000000000FFFF07C00000000000FFFE07C000000
+00000FFFE07E00000000001FFFE07E00000000001FFFC03F00000000003FFFC03F000000
+00003FFF801F80000000007FFF801FC000000000FFFF000FE000000001FFFE0007F00000
+0003FFFC0003FC00000007FFF80001FF0000000FFFF00000FFE000007FFFC000007FFF00
+03FFFF8000001FFFFFFFFFFE00000007FFFFFFFFF800000001FFFFFFFFC0000000003FFF
+FFFE000000000000FFFF8000000044547AD250>199 D<FFFFFFFFFF8007FFFFFFFFFCFF
+FFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFF
+FFFFFFFF8007FFFFFFFFFC0007FFF0000000003FFF80000007FFF0000000007FFF800000
+07FFF000000000FFFF80000007FFF000000000FFFF80000007FFF000000001FFFF800000
+07FFF000000001FFFF80000007FFF000000003FFFF80000007FFF000000007FFFF800000
+07FFF000000007FFFF80000007FFF00000000FFFFF80000007FFF00000001FFFFF800000
+07FFF00000001FBFFF80000007FFF00000003F3FFF80000007FFF00000003F3FFF800000
+07FFF00000007E3FFF80000007FFF0000000FE3FFF80000007FFF0000000FC3FFF800000
+07FFF0000001F83FFF80000007FFF0000001F83FFF80000007FFF0000003F03FFF800000
+07FFF0000007E03FFF80000007FFF0000007E03FFF80000007FFF000000FC03FFF800000
+07FFF000000FC03FFF80000007FFF000001F803FFF80000007FFF000003F003FFF800000
+07FFF000003F003FFF80000007FFF000007E003FFF80000007FFF000007E003FFF800000
+07FFF00000FC003FFF80000007FFF00001F8003FFF80000007FFF00001F8003FFF800000
+07FFF00003F0003FFF80000007FFF00007F0003FFF80000007FFF00007E0003FFF800000
+07FFF0000FC0003FFF80000007FFF0000FC0003FFF80000007FFF0001F80003FFF800000
+07FFF0003F80003FFF80000007FFF0003F00003FFF80000007FFF0007E00003FFF800000
+07FFF0007E00003FFF80000007FFF000FC00003FFF80000007FFF001F800003FFF800000
+07FFF001F800003FFF80000007FFF003F000003FFF80000007FFF003F000003FFF800000
+07FFF007E000003FFF80000007FFF00FC000003FFF80000007FFF00FC000003FFF800000
+07FFF01F8000003FFF80000007FFF01F8000003FFF80000007FFF03F0000003FFF800000
+07FFF07E0000003FFF80000007FFF07E0000003FFF80000007FFF0FC0000003FFF800000
+07FFF1FC0000003FFF80000007FFF1F80000003FFF80000007FFF3F00000003FFF800000
+07FFF3F00000003FFF80000007FFF7E00000003FFF80000007FFFFE00000003FFF800000
+07FFFFC00000003FFF80000007FFFF800000003FFF80000007FFFF800000003FFF800000
+07FFFF000000003FFF80000007FFFE000000003FFF80000007FFFE000000003FFF800000
+07FFFC000000003FFF80000007FFFC000000003FFF80000007FFF8000000003FFF800000
+07FFF0000000003FFF8000FFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFF
+FFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFC5E
+527CD167>I<FFFFFFFFFF800003FFFFFFE0FFFFFFFFFF800003FFFFFFE0FFFFFFFFFF80
+0003FFFFFFE0FFFFFFFFFF800003FFFFFFE0FFFFFFFFFF800003FFFFFFE00007FFF00000
+00000FFF80000007FFF00000000001FC00000007FFF00000000003F800000007FFF00000
+00000FF000000007FFF0000000001FE000000007FFF0000000003FC000000007FFF00000
+00007F0000000007FFF000000000FE0000000007FFF000000001FC0000000007FFF00000
+0003F80000000007FFF000000007F00000000007FFF00000000FE00000000007FFF00000
+003FC00000000007FFF00000007F800000000007FFF0000000FF000000000007FFF00000
+01FC000000000007FFF0000003F8000000000007FFF0000007F0000000000007FFF00000
+0FE0000000000007FFF000001FC0000000000007FFF000007F80000000000007FFF00000
+FF00000000000007FFF00001FE00000000000007FFF00003F800000000000007FFF00007
+F000000000000007FFF0000FE000000000000007FFF0001FC000000000000007FFF0003F
+E000000000000007FFF0007FF000000000000007FFF001FFF000000000000007FFF003FF
+F800000000000007FFF007FFFC00000000000007FFF00FFFFE00000000000007FFF01FFF
+FE00000000000007FFF03FFFFF00000000000007FFF07FFFFF80000000000007FFF0FE7F
+FF80000000000007FFF3FC7FFFC0000000000007FFF7F83FFFE0000000000007FFFFF01F
+FFF0000000000007FFFFC00FFFF0000000000007FFFF800FFFF8000000000007FFFF0007
+FFFC000000000007FFFE0003FFFC000000000007FFFC0003FFFE000000000007FFF80001
+FFFF000000000007FFF00000FFFF800000000007FFF000007FFF800000000007FFF00000
+7FFFC00000000007FFF000003FFFE00000000007FFF000001FFFE00000000007FFF00000
+1FFFF00000000007FFF000000FFFF80000000007FFF0000007FFFC0000000007FFF00000
+03FFFC0000000007FFF0000003FFFE0000000007FFF0000001FFFF0000000007FFF00000
+00FFFF0000000007FFF0000000FFFF8000000007FFF00000007FFFC000000007FFF00000
+003FFFE000000007FFF00000001FFFE000000007FFF00000001FFFF000000007FFF00000
+000FFFF800000007FFF000000007FFF800000007FFF000000007FFFC00000007FFF00000
+0003FFFE00000007FFF000000001FFFF00000007FFF000000000FFFF00000007FFF00000
+0000FFFF80000007FFF0000000007FFFC0000007FFF000000000FFFFE000FFFFFFFFFF80
+00FFFFFFFFF8FFFFFFFFFF8000FFFFFFFFF8FFFFFFFFFF8000FFFFFFFFF8FFFFFFFFFF80
+00FFFFFFFFF8FFFFFFFFFF8000FFFFFFFFF85D527CD167>202 D<FFFFFFF00000000000
+0001FFFFFFF0FFFFFFF800000000000003FFFFFFF0FFFFFFFC00000000000007FFFFFFF0
+FFFFFFFC00000000000007FFFFFFF0FFFFFFFC00000000000007FFFFFFF00007FFFE0000
+000000000FFFFE00000007FFFE0000000000000FFFFE00000007DFFF0000000000001F7F
+FE00000007DFFF0000000000001F7FFE00000007CFFF8000000000003E7FFE00000007CF
+FF8000000000003E7FFE00000007CFFF8000000000003E7FFE00000007C7FFC000000000
+007C7FFE00000007C7FFC000000000007C7FFE00000007C3FFE00000000000F87FFE0000
+0007C3FFE00000000000F87FFE00000007C1FFF00000000001F07FFE00000007C1FFF000
+00000001F07FFE00000007C0FFF80000000003E07FFE00000007C0FFF80000000003E07F
+FE00000007C0FFF80000000003E07FFE00000007C07FFC0000000007C07FFE00000007C0
+7FFC0000000007C07FFE00000007C03FFE000000000F807FFE00000007C03FFE00000000
+0F807FFE00000007C01FFF000000001F007FFE00000007C01FFF000000001F007FFE0000
+0007C01FFF000000001F007FFE00000007C00FFF800000003E007FFE00000007C00FFF80
+0000003E007FFE00000007C007FFC00000007C007FFE00000007C007FFC00000007C007F
+FE00000007C003FFE0000000F8007FFE00000007C003FFE0000000F8007FFE00000007C0
+03FFE0000000F8007FFE00000007C001FFF0000001F0007FFE00000007C001FFF0000001
+F0007FFE00000007C000FFF8000003E0007FFE00000007C000FFF8000003E0007FFE0000
+0007C0007FFC000007C0007FFE00000007C0007FFC000007C0007FFE00000007C0007FFC
+000007C0007FFE00000007C0003FFE00000F80007FFE00000007C0003FFE00000F80007F
+FE00000007C0001FFF00001F00007FFE00000007C0001FFF00001F00007FFE00000007C0
+000FFF80003E00007FFE00000007C0000FFF80003E00007FFE00000007C0000FFF80003E
+00007FFE00000007C00007FFC0007C00007FFE00000007C00007FFC0007C00007FFE0000
+0007C00003FFE000F800007FFE00000007C00003FFE000F800007FFE00000007C00001FF
+F001F000007FFE00000007C00001FFF001F000007FFE00000007C00000FFF803E000007F
+FE00000007C00000FFF803E000007FFE00000007C00000FFF803E000007FFE00000007C0
+00007FFC07C000007FFE00000007C000007FFC07C000007FFE00000007C000003FFE0F80
+00007FFE00000007C000003FFE0F8000007FFE00000007C000001FFF1F0000007FFE0000
+0007C000001FFF1F0000007FFE00000007C000001FFF1F0000007FFE00000007C000000F
+FFBE0000007FFE00000007C000000FFFBE0000007FFE00000007C0000007FFFC0000007F
+FE00000007C0000007FFFC0000007FFE00000007C0000003FFF80000007FFE00000007C0
+000003FFF80000007FFE00000007C0000003FFF80000007FFE00000007C0000001FFF000
+00007FFE00000007C0000001FFF00000007FFE00000007C0000000FFE00000007FFE0000
+0007C0000000FFE00000007FFE0000001FF00000007FC00000007FFE0000FFFFFFFE0000
+7FC0000FFFFFFFFFF0FFFFFFFE00007FC0000FFFFFFFFFF0FFFFFFFE00003F80000FFFFF
+FFFFF0FFFFFFFE00003F80000FFFFFFFFFF0FFFFFFFE00001F00000FFFFFFFFFF074527C
+D17D>204 D<FFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF80
+07FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFC0007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFFFFFFFFFFFFFFF80000007FFFFFFFF
+FFFFFFFF80000007FFFFFFFFFFFFFFFF80000007FFFFFFFFFFFFFFFF80000007FFFFFFFF
+FFFFFFFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF00000
+00003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF8000FFFFFFFFFF80
+07FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF80
+07FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFC5E527CD167>I<FFFFFFFFFFFFFFFFFFFFFF
+FCFFFFFFFFFFFFFFFFFFFFFFFCFFFFFFFFFFFFFFFFFFFFFFFCFFFFFFFFFFFFFFFFFFFFFF
+FCFFFFFFFFFFFFFFFFFFFFFFFC0007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF80000007FFF0000000003FFF80000007FFF0000000003FFF80
+000007FFF0000000003FFF8000FFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFF
+FCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFFFCFFFFFFFFFF8007FFFFFFFF
+FC5E527CD167>207 D<FFFFFFFFFFFFFC000000FFFFFFFFFFFFFFE00000FFFFFFFFFFFF
+FFFE0000FFFFFFFFFFFFFFFF8000FFFFFFFFFFFFFFFFE000000FFFE000003FFFF000000F
+FFE0000003FFFC00000FFFE0000000FFFE00000FFFE00000007FFF00000FFFE00000003F
+FF80000FFFE00000001FFFC0000FFFE00000000FFFE0000FFFE000000007FFE0000FFFE0
+00000007FFF0000FFFE000000007FFF0000FFFE000000007FFF8000FFFE000000003FFF8
+000FFFE000000003FFF8000FFFE000000003FFFC000FFFE000000003FFFC000FFFE00000
+0003FFFC000FFFE000000003FFFC000FFFE000000003FFFC000FFFE000000003FFFC000F
+FFE000000003FFFC000FFFE000000003FFFC000FFFE000000003FFFC000FFFE000000003
+FFF8000FFFE000000003FFF8000FFFE000000003FFF8000FFFE000000007FFF8000FFFE0
+00000007FFF0000FFFE000000007FFF0000FFFE000000007FFE0000FFFE00000000FFFC0
+000FFFE00000001FFFC0000FFFE00000003FFF80000FFFE00000007FFF00000FFFE00000
+00FFFE00000FFFE0000007FFF800000FFFE000003FFFF000000FFFFFFFFFFFFFC000000F
+FFFFFFFFFFFF0000000FFFFFFFFFFFF80000000FFFFFFFFFFF800000000FFFE000000000
+0000000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000000FFFE0
+000000000000000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000
+000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000000FFFE00000
+00000000000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000000F
+FFE0000000000000000FFFE0000000000000000FFFE0000000000000000FFFE000000000
+0000000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000000FFFE0
+000000000000000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000
+000FFFE0000000000000000FFFE0000000000000000FFFE0000000000000000FFFE00000
+00000000000FFFE0000000000000000FFFE0000000000000FFFFFFFFFE0000000000FFFF
+FFFFFE0000000000FFFFFFFFFE0000000000FFFFFFFFFE0000000000FFFFFFFFFE000000
+00004E527CD15A>I<0000000003FFF0000007000000007FFFFF00000F00000007FFFFFF
+E0001F0000003FFFFFFFF8003F000000FFFFFFFFFE007F000003FFFFC003FF00FF00000F
+FFF800003FC1FF00003FFFC000000FE3FF0000FFFF00000003FFFF0001FFFC00000001FF
+FF0003FFF800000000FFFF0007FFE0000000007FFF001FFFC0000000003FFF003FFF8000
+0000001FFF003FFF00000000000FFF007FFE000000000007FF00FFFC000000000003FF01
+FFFC000000000003FF01FFF8000000000001FF03FFF0000000000001FF07FFF000000000
+0000FF07FFF0000000000000FF0FFFE00000000000007F0FFFE00000000000007F1FFFC0
+0000000000007F1FFFC00000000000003F1FFFC00000000000003F3FFF80000000000000
+3F3FFF800000000000001F3FFF800000000000001F7FFF800000000000001F7FFF800000
+000000001F7FFF80000000000000007FFF00000000000000007FFF0000000000000000FF
+FF0000000000000000FFFF0000000000000000FFFF0000000000000000FFFF0000000000
+000000FFFF0000000000000000FFFF0000000000000000FFFF0000000000000000FFFF00
+00000000000000FFFF0000000000000000FFFF0000000000000000FFFF00000000000000
+00FFFF0000000000000000FFFF0000000000000000FFFF00000000000000007FFF000000
+00000000007FFF00000000000000007FFF80000000000000007FFF80000000000000007F
+FF80000000000000003FFF800000000000001F3FFF800000000000001F3FFF8000000000
+00001F1FFFC00000000000001F1FFFC00000000000001F1FFFC00000000000003F0FFFE0
+0000000000003F0FFFE00000000000003E07FFF00000000000003E07FFF0000000000000
+7E03FFF80000000000007C01FFF8000000000000FC01FFFC000000000000F800FFFC0000
+00000001F8007FFE000000000003F0003FFF000000000003F0003FFF800000000007E000
+1FFFC0000000000FC00007FFE0000000001F800003FFF8000000003F000001FFFC000000
+00FE000000FFFF00000001FC0000003FFFC0000007F80000000FFFFC00003FF000000003
+FFFFC001FFC000000000FFFFFFFFFF00000000003FFFFFFFFC000000000007FFFFFFF000
+00000000007FFFFF8000000000000003FFF0000000505479D25F>I<3FFFFFFFFFFFFFFF
+FFFE003FFFFFFFFFFFFFFFFFFE003FFFFFFFFFFFFFFFFFFE003FFFFFFFFFFFFFFFFFFE00
+3FFFFFFFFFFFFFFFFFFE003FFFC0007FFF0001FFFE003FFC00007FFF00001FFE007FF000
+007FFF000007FF007FE000007FFF000003FF007FC000007FFF000001FF007F8000007FFF
+000000FF007F0000007FFF0000007F007F0000007FFF0000007F007E0000007FFF000000
+3F007E0000007FFF0000003F007E0000007FFF0000003F007C0000007FFF0000001F007C
+0000007FFF0000001F007C0000007FFF0000001F007C0000007FFF0000001F007C000000
+7FFF0000001F00FC0000007FFF0000001F80F80000007FFF0000000F80F80000007FFF00
+00000F80F80000007FFF0000000F80F80000007FFF0000000F80F80000007FFF0000000F
+80F80000007FFF0000000F80000000007FFF0000000000000000007FFF00000000000000
+00007FFF0000000000000000007FFF0000000000000000007FFF0000000000000000007F
+FF0000000000000000007FFF0000000000000000007FFF0000000000000000007FFF0000
+000000000000007FFF0000000000000000007FFF0000000000000000007FFF0000000000
+000000007FFF0000000000000000007FFF0000000000000000007FFF0000000000000000
+007FFF0000000000000000007FFF0000000000000000007FFF0000000000000000007FFF
+0000000000000000007FFF0000000000000000007FFF0000000000000000007FFF000000
+0000000000007FFF0000000000000000007FFF0000000000000000007FFF000000000000
+0000007FFF0000000000000000007FFF0000000000000000007FFF000000000000000000
+7FFF0000000000000000007FFF0000000000000000007FFF0000000000000000007FFF00
+00000000000000007FFF0000000000000000007FFF0000000000000000007FFF00000000
+00000000007FFF0000000000000000007FFF0000000000000000007FFF00000000000000
+00007FFF0000000000000000007FFF0000000000000000007FFF0000000000000000007F
+FF0000000000000000007FFF0000000000000000007FFF0000000000000000007FFF0000
+000000000000007FFF0000000000000000007FFF0000000000000000007FFF0000000000
+000000007FFF00000000000001FFFFFFFFFFFFC000000001FFFFFFFFFFFFC000000001FF
+FFFFFFFFFFC000000001FFFFFFFFFFFFC000000001FFFFFFFFFFFFC0000051527BD15C>
+I<FFFFFFFFF80000003FFFFFF0FFFFFFFFF80000003FFFFFF0FFFFFFFFF80000003FFFFF
+F0FFFFFFFFF80000003FFFFFF0FFFFFFFFF80000003FFFFFF0001FFFF000000000003FF0
+00000FFFF000000000000FC000000FFFF800000000000F80000007FFFC00000000001F80
+000003FFFC00000000001F80000003FFFE00000000001F00000001FFFE00000000003F00
+000000FFFF00000000003E00000000FFFF80000000007E000000007FFF80000000007E00
+0000003FFFC0000000007C000000003FFFE000000000FC000000001FFFE000000000F800
+0000001FFFF000000001F8000000000FFFF800000001F80000000007FFF800000001F000
+00000007FFFC00000003F00000000003FFFE00000003E00000000001FFFE00000007E000
+00000001FFFF00000007E00000000000FFFF00000007C000000000007FFF8000000FC000
+000000007FFFC000000F8000000000003FFFC000001F8000000000001FFFE000001F8000
+000000001FFFF000001F0000000000000FFFF000003F0000000000000FFFF800003E0000
+0000000007FFFC00007E00000000000003FFFC00007E00000000000003FFFE00007C0000
+0000000001FFFF0000FC00000000000000FFFF0000F800000000000000FFFF8001F80000
+00000000007FFF8001F8000000000000003FFFC001F0000000000000003FFFE003F00000
+00000000001FFFE003E0000000000000000FFFF007E0000000000000000FFFF807E00000
+000000000007FFF807C00000000000000007FFFC0FC00000000000000003FFFE0F800000
+000000000001FFFE1F800000000000000001FFFF1F800000000000000000FFFF9F000000
+0000000000007FFFBF0000000000000000007FFFFE0000000000000000003FFFFE000000
+0000000000001FFFFE0000000000000000001FFFFC0000000000000000000FFFFC000000
+00000000000007FFF800000000000000000007FFF800000000000000000003FFF8000000
+00000003800003FFF00000000000000FF00001FFF00000000000003FF80000FFE0000000
+0000007FFC0000FFE00000000000007FFE00007FC0000000000000FFFE00003FC0000000
+000000FFFF00003F80000000000000FFFF00001F00000000000000FFFF00003F00000000
+000000FFFF00007E00000000000000FFFF00007E00000000000000FFFE0000FC00000000
+000000FFFE0001F8000000000000007FFC0003F0000000000000007FF8000FF000000000
+0000003FE0001FE0000000000000003FC000FFC0000000000000001FF807FF0000000000
+0000000FFFFFFE000000000000000003FFFFFC000000000000000001FFFFF00000000000
+000000007FFF800000000000000000000FFC000000000000005C537DD163>I<000000FF
+FFFFFFFFFC000000000000FFFFFFFFFFFC000000000000FFFFFFFFFFFC000000000000FF
+FFFFFFFFFC000000000000FFFFFFFFFFFC0000000000000000FFFC000000000000000000
+00FFFC00000000000000000000FFFC00000000000000000000FFFC000000000000000000
+00FFFC00000000000000000000FFFC00000000000000000000FFFC000000000000000001
+FFFFFFFE00000000000000FFFFFFFFFFFC00000000000FFFFFFFFFFFFFC0000000007FFF
+FFFFFFFFFFF800000001FFFFE0FFFC1FFFFE0000000FFFFC00FFFC00FFFFC000001FFFE0
+00FFFC001FFFE000007FFF8000FFFC0007FFF80000FFFE0000FFFC0001FFFC0001FFFC00
+00FFFC0000FFFE0003FFF80000FFFC00007FFF0007FFF00000FFFC00003FFF800FFFE000
+00FFFC00001FFFC00FFFE00000FFFC00001FFFC01FFFC00000FFFC00000FFFE01FFFC000
+00FFFC00000FFFE03FFF800000FFFC000007FFF03FFF800000FFFC000007FFF07FFF8000
+00FFFC000007FFF87FFF800000FFFC000007FFF87FFF000000FFFC000003FFF87FFF0000
+00FFFC000003FFF8FFFF000000FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF0000
+00FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF0000
+00FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF0000
+00FFFC000003FFFCFFFF000000FFFC000003FFFCFFFF000000FFFC000003FFFC7FFF0000
+00FFFC000003FFF87FFF000000FFFC000003FFF87FFF800000FFFC000007FFF87FFF8000
+00FFFC000007FFF83FFF800000FFFC000007FFF03FFF800000FFFC000007FFF01FFFC000
+00FFFC00000FFFE01FFFC00000FFFC00000FFFE00FFFE00000FFFC00001FFFC00FFFE000
+00FFFC00001FFFC007FFF00000FFFC00003FFF8003FFF80000FFFC00007FFF0001FFFC00
+00FFFC0000FFFE0000FFFE0000FFFC0001FFFC00007FFF8000FFFC0007FFF800001FFFE0
+00FFFC001FFFE000000FFFFC00FFFC00FFFFC0000001FFFFE0FFFC1FFFFE000000007FFF
+FFFFFFFFFFF8000000000FFFFFFFFFFFFFC00000000000FFFFFFFFFFFC00000000000001
+FFFFFFFE000000000000000000FFFC00000000000000000000FFFC000000000000000000
+00FFFC00000000000000000000FFFC00000000000000000000FFFC000000000000000000
+00FFFC00000000000000000000FFFC00000000000000000000FFFC000000000000000000
+00FFFC00000000000000000000FFFC0000000000000000FFFFFFFFFFFC000000000000FF
+FFFFFFFFFC000000000000FFFFFFFFFFFC000000000000FFFFFFFFFFFC000000000000FF
+FFFFFFFFFC0000005E5279D16D>I<00003FFE000000000007FFFFE0000000001FFFFFFC
+000000007FFFFFFF00000001FFC00FFFC0000003FE0003FFE0000007FF0000FFF0000007
+FF80007FF800000FFFC0007FFC00000FFFC0003FFE00000FFFC0003FFE00000FFFC0001F
+FF00000FFFC0001FFF00000FFFC0001FFF00000FFFC0000FFF800007FF80000FFF800003
+FF00000FFF800001FE00000FFF8000000000000FFF8000000000000FFF8000000000000F
+FF8000000000000FFF8000000000000FFF8000000000000FFF800000000007FFFF800000
+0003FFFFFF800000007FFFFFFF80000003FFFFFFFF8000001FFFF00FFF8000007FFF000F
+FF800000FFFC000FFF800003FFF0000FFF800007FFC0000FFF80000FFF80000FFF80001F
+FF00000FFF80003FFF00000FFF80003FFE00000FFF80007FFC00000FFF80007FFC00000F
+FF81F0FFFC00000FFF81F0FFF800000FFF81F0FFF800000FFF81F0FFF800000FFF81F0FF
+F800001FFF81F0FFF800001FFF81F0FFFC00003FFF81F07FFC00003FFF81F07FFE00007F
+FF81F03FFE0000F7FFC3F03FFF0001E3FFC3E01FFFC007E3FFFFE007FFF01F81FFFFC003
+FFFFFF00FFFF8000FFFFFC007FFF00001FFFF0003FFC000001FF800007F0003C387CB642
+>224 D<000000000000FC0000000000000FFC000000000000FFFC00000000003FFFFC00
+0000000FFFFFFC00000001FFFFFFFC0000001FFFFFFFF8000000FFFFFFFFF8000003FFFF
+FFFFF000000FFFFFFFFFF000001FFFFFFFFFE000003FFFFFFFFF800000FFFFFFFFFF0000
+00FFFFFFFFF0000001FFFFFFE000000003FFFFC00000000007FFF8000000000007FFE000
+000000000FFF8000000000000FFE0000000000000FFC0000000000001FF8000000000000
+1FF00000000000001FE00000000000003FE00000000000003FC00000000000003F800000
+000000003F800000000000007F0001FFC00000007F003FFFFE0000007F00FFFFFF800000
+7E03FFFFFFE000007E0FFF80FFF800007E3FFC001FFE00007C7FF00007FF00007CFFE000
+03FF8000FDFFC00001FFC000FFFF800000FFE000FFFF0000007FE000FFFF0000007FF000
+FFFF0000007FF800FFFE0000003FF800FFFE0000003FFC00FFFE0000003FFC00FFFE0000
+003FFE00FFFC0000001FFE00FFFC0000001FFE00FFFC0000001FFF00FFFC0000001FFF00
+FFFC0000001FFF00FFFC0000001FFF00FFFC0000001FFF80FFFC0000001FFF80FFFC0000
+001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80
+FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000
+001FFF807FFC0000001FFF007FFC0000001FFF007FFC0000001FFF003FFC0000001FFE00
+3FFE0000003FFE003FFE0000003FFE001FFE0000003FFC001FFE0000003FFC000FFF0000
+007FF8000FFF0000007FF80007FF800000FFF00003FF800000FFE00001FFC00001FFC000
+00FFE00003FF8000007FF00007FF0000003FFC001FFE0000001FFF80FFFC00000007FFFF
+FFF000000001FFFFFFC0000000003FFFFE000000000003FFE000000039547CD242>I<FF
+FFFFFFFE000000FFFFFFFFFFF00000FFFFFFFFFFFC0000FFFFFFFFFFFF000000FFF8001F
+FF800000FFF80007FFE00000FFF80001FFF00000FFF80001FFF00000FFF80000FFF80000
+FFF80000FFF80000FFF800007FFC0000FFF800007FFC0000FFF800007FFC0000FFF80000
+7FFC0000FFF800007FFC0000FFF800007FFC0000FFF80000FFF80000FFF80000FFF80000
+FFF80001FFF00000FFF80003FFE00000FFF80007FFC00000FFF8001FFF000000FFFFFFFF
+FC000000FFFFFFFFF0000000FFFFFFFFE0000000FFFFFFFFFC000000FFF80007FF000000
+FFF80001FFC00000FFF80000FFF00000FFF800007FF80000FFF800003FFC0000FFF80000
+3FFE0000FFF800001FFE0000FFF800001FFF0000FFF800001FFF0000FFF800001FFF8000
+FFF800001FFF8000FFF800001FFF8000FFF800001FFF8000FFF800001FFF8000FFF80000
+1FFF8000FFF800001FFF0000FFF800001FFF0000FFF800003FFF0000FFF800003FFE0000
+FFF800007FFC0000FFF80000FFFC0000FFF80003FFF80000FFF8000FFFF000FFFFFFFFFF
+FFC000FFFFFFFFFFFF0000FFFFFFFFFFFC0000FFFFFFFFFFC0000039357CB442>I<FFFF
+FFFFFFFF00FFFFFFFFFFFF00FFFFFFFFFFFF00FFFFFFFFFFFF0000FFF8001FFF0000FFF8
+0003FF0000FFF80001FF0000FFF800007F0000FFF800007F0000FFF800003F0000FFF800
+003F0000FFF800001F8000FFF800001F8000FFF800001F8000FFF800001F8000FFF80000
+0F8000FFF800000F8000FFF800000F8000FFF800000F8000FFF800000F8000FFF800000F
+8000FFF80000000000FFF80000000000FFF80000000000FFF80000000000FFF800000000
+00FFF80000000000FFF80000000000FFF80000000000FFF80000000000FFF80000000000
+FFF80000000000FFF80000000000FFF80000000000FFF80000000000FFF80000000000FF
+F80000000000FFF80000000000FFF80000000000FFF80000000000FFF80000000000FFF8
+0000000000FFF80000000000FFF80000000000FFF80000000000FFF80000000000FFF800
+00000000FFF80000000000FFF800000000FFFFFFFE000000FFFFFFFE000000FFFFFFFE00
+0000FFFFFFFE00000031357CB439>I<0000FFFFFFFFFFFFF80000FFFFFFFFFFFFF80000
+FFFFFFFFFFFFF80000FFFFFFFFFFFFF8000000FC0000FFF800000000F80000FFF8000000
+00F80000FFF800000000F80000FFF800000000F80000FFF800000000F80000FFF8000000
+00F80000FFF800000000F80000FFF800000000F80000FFF800000000F80000FFF8000000
+00F80000FFF800000000F80000FFF800000000F80000FFF800000000F80000FFF8000000
+00F80000FFF800000000F00000FFF800000000F00000FFF800000001F00000FFF8000000
+01F00000FFF800000001F00000FFF800000001F00000FFF800000001F00000FFF8000000
+01E00000FFF800000003E00000FFF800000003E00000FFF800000003E00000FFF8000000
+03C00000FFF800000007C00000FFF800000007C00000FFF800000007C00000FFF8000000
+0F800000FFF80000000F800000FFF80000001F000000FFF80000001F000000FFF8000000
+3F000000FFF80000003E000000FFF80000007C000000FFF80000007C000000FFF8000000
+F8000000FFF8000001F8000000FFF8000003F0000000FFF8000007E0000000FFF800000F
+C0000000FFF800003F80000000FFF800007F00000000FFF8003FFFFFFFFFFFFFFFFC3FFF
+FFFFFFFFFFFFFC3FFFFFFFFFFFFFFFFC3FFFFFFFFFFFFFFFFC3FFF0000000000FFFC3FF8
+00000000001FFC7FE0000000000007FE7FC0000000000003FE7F80000000000001FE7F00
+000000000000FE7F000000000000007E7E000000000000007E7E000000000000007E7C00
+0000000000003E7C000000000000003E7C000000000000003E7C000000000000003EFC00
+0000000000003FF8000000000000001FF8000000000000001FF8000000000000001FF800
+0000000000001FF8000000000000001F484880B449>I<000007FF80000000007FFFF800
+000001FFFFFE00000007FFFFFF8000001FFF03FFE000003FFC007FF000007FF0003FF800
+00FFE0001FFC0001FFC0000FFC0003FF800007FE0007FF800007FF000FFF000003FF000F
+FF000003FF801FFE000003FF801FFE000001FF803FFE000001FFC03FFE000001FFC03FFE
+000001FFC07FFC000001FFC07FFC000001FFE07FFC000000FFE07FFC000000FFE0FFFC00
+0000FFE0FFFC000000FFE0FFFFFFFFFFFFE0FFFFFFFFFFFFE0FFFFFFFFFFFFE0FFFFFFFF
+FFFFE0FFFC0000000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC000000
+0000FFFC00000000007FFC00000000007FFC00000000007FFC00000000007FFE00000000
+003FFE00000000003FFE00000000003FFE00000003E01FFF00000003E01FFF00000007E0
+0FFF00000007C007FF8000000FC007FF8000000F8003FFC000001F8001FFE000003F0000
+FFF000007E00007FFC0001FC00001FFF0007F800000FFFE03FF0000003FFFFFFC0000000
+FFFFFF800000003FFFFC0000000001FFE0000033387CB63C>I<1FFFFF0003FFFFFFE000
+7FFFFC001FFFFF0003FFFFFFE0007FFFFC001FFFFF0003FFFFFFE0007FFFFC001FFFFF00
+03FFFFFFE0007FFFFC00007FFC000003FFE000001FFF0000000FF8000003FFE000000FF8
+00000003FC000003FFE000001FE000000001FE000003FFE000003FC000000000FF000003
+FFE000007F80000000007FC00003FFE00001FF00000000001FE00003FFE00003FC000000
+00000FF00003FFE00007F8000000000007FC0003FFE0001FF0000000000001FE0003FFE0
+003FC0000000000000FF0003FFE0007F800000000000007F8003FFE000FF000000000000
+001FE003FFE003FC000000000000000FF003FFE007F80000000000000007F803FFE00FF0
+0000000000000003FE03FFE03FE00000000000000003FF03FFE07FE00000000000000007
+FF83FFE0FFF0000000000000000FFFE3FFE3FFF8000000000000001FFFF3FFE7FFFC0000
+00000000003FFFFBFFEFFFFE000000000000003FFFFFFFFFFFFE000000000000007FFFFF
+FFFFFFFF00000000000000FFFE7FFFFF3FFF80000000000001FFFC3FFFFE1FFFC0000000
+000003FFF80FFFF80FFFE0000000000003FFF007FFF007FFE0000000000007FFF003FFE0
+07FFF000000000000FFFE003FFE003FFF800000000001FFFC003FFE001FFFC0000000000
+3FFF8003FFE000FFFE00000000003FFF0003FFE0007FFE00000000007FFF0003FFE0007F
+FF0000000000FFFE0003FFE0003FFF8000000001FFFC0003FFE0001FFFC000000003FFF8
+0003FFE0000FFFE000000007FFF00003FFE00007FFF000000007FFF00003FFE00007FFF0
+0000000FFFE00003FFE00003FFF80000001FFFC00003FFE00001FFFC0000003FFF800003
+FFE00000FFFE0000007FFF000003FFE000007FFF0000007FFF000003FFE000007FFF0000
+00FFFE000003FFE000003FFF800003FFFF000003FFE000007FFFE000FFFFFFE003FFFFFF
+E003FFFFFF80FFFFFFE003FFFFFFE003FFFFFF80FFFFFFE003FFFFFFE003FFFFFF80FFFF
+FFE003FFFFFFE003FFFFFF8069357EB46E>I<7000FFFE0000007C0FFFFFF000007E3FFF
+FFFE00007FFFFFFFFF80007FFF801FFFE0007FF80003FFF0007FF00000FFF8007FC00000
+7FFC007F8000007FFC007F8000003FFE007F0000003FFE007E0000001FFF007E0000001F
+FF007E0000001FFF007C0000001FFF007C0000001FFF00000000001FFF00000000003FFE
+00000000003FFE00000000007FFC00000000007FF80000000001FFF00000000003FFC000
+0000000FFF80000001FFFFFC00000003FFFFF000000003FFFFF000000003FFFFFE000000
+00001FFFC00000000003FFE00000000000FFF800000000007FFC00000000003FFE000000
+00001FFF00000000001FFF00000000000FFF80000000000FFF80000000000FFFC0000000
+000FFFC0000000000FFFC0000000000FFFC0F80000000FFFC0F80000000FFFC0F8000000
+0FFFC0FC0000000FFF807C0000001FFF807E0000001FFF007E0000003FFF003F0000007F
+FE001F800000FFFC001FE00003FFF8000FFE001FFFF00003FFFFFFFFC00000FFFFFFFF00
+00003FFFFFF800000003FFFF00000032387DB63A>I<FFFFFFF807FFFFFFC0FFFFFFF807
+FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC000FFF8000007FFC00000FFF80000
+07FFC00000FFF800000FFFC00000FFF800001FFFC00000FFF800001FFFC00000FFF80000
+3FFFC00000FFF800007FFFC00000FFF800007FFFC00000FFF80000FFFFC00000FFF80001
+F7FFC00000FFF80001F7FFC00000FFF80003E7FFC00000FFF80007C7FFC00000FFF80007
+C7FFC00000FFF8000F87FFC00000FFF8001F07FFC00000FFF8003F07FFC00000FFF8003E
+07FFC00000FFF8007C07FFC00000FFF800FC07FFC00000FFF800F807FFC00000FFF801F0
+07FFC00000FFF803F007FFC00000FFF803E007FFC00000FFF807C007FFC00000FFF80FC0
+07FFC00000FFF80F8007FFC00000FFF81F0007FFC00000FFF83F0007FFC00000FFF83E00
+07FFC00000FFF87C0007FFC00000FFF8F80007FFC00000FFF8F80007FFC00000FFF9F000
+07FFC00000FFFBE00007FFC00000FFFBE00007FFC00000FFFFC00007FFC00000FFFF8000
+07FFC00000FFFF800007FFC00000FFFF000007FFC00000FFFE000007FFC00000FFFE0000
+07FFC00000FFFC000007FFC00000FFF8000007FFC00000FFF8000007FFC000FFFFFFF807
+FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC042357DB449
+>I<00003E00001F0000000000FF80007FC000000001FFC000FFE000000003FFE001FFF0
+00000003FFE001FFF000000007FFF003FFF800000007FFF003FFF800000007FFF003FFF8
+00000007FFF003FFF800000007FFF003FFF800000007FFE001FFF800000003FFE001FFF0
+00000003FFC000FFF000000001FF80007FE000000001FF80007FE000000000FFFFFFFFC0
+000000003FFFFFFF00000000001FFFFFFE000000000007FFFFF8000000000001FFFFE000
+00000000001FFE0000000000000000000000000000000000000000000000000000000000
+0000000000000000000000FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFF
+FFC0FFFFFFF807FFFFFFC000FFF8000007FFC00000FFF8000007FFC00000FFF800000FFF
+C00000FFF800001FFFC00000FFF800001FFFC00000FFF800003FFFC00000FFF800007FFF
+C00000FFF800007FFFC00000FFF80000FFFFC00000FFF80001F7FFC00000FFF80001F7FF
+C00000FFF80003E7FFC00000FFF80007C7FFC00000FFF80007C7FFC00000FFF8000F87FF
+C00000FFF8001F07FFC00000FFF8003F07FFC00000FFF8003E07FFC00000FFF8007C07FF
+C00000FFF800FC07FFC00000FFF800F807FFC00000FFF801F007FFC00000FFF803F007FF
+C00000FFF803E007FFC00000FFF807C007FFC00000FFF80FC007FFC00000FFF80F8007FF
+C00000FFF81F0007FFC00000FFF83F0007FFC00000FFF83E0007FFC00000FFF87C0007FF
+C00000FFF8F80007FFC00000FFF8F80007FFC00000FFF9F00007FFC00000FFFBE00007FF
+C00000FFFBE00007FFC00000FFFFC00007FFC00000FFFF800007FFC00000FFFF800007FF
+C00000FFFF000007FFC00000FFFE000007FFC00000FFFE000007FFC00000FFFC000007FF
+C00000FFF8000007FFC00000FFF8000007FFC000FFFFFFF807FFFFFFC0FFFFFFF807FFFF
+FFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0424E7DCD49>I<FFFFFFF8001FFFFF00
+FFFFFFF8001FFFFF00FFFFFFF8001FFFFF00FFFFFFF8001FFFFF0000FFF8000007FFC000
+00FFF8000003FE000000FFF8000007F8000000FFF800000FF0000000FFF800001FE00000
+00FFF800007FC0000000FFF80000FF00000000FFF80001FE00000000FFF80007FC000000
+00FFF8000FF000000000FFF8001FE000000000FFF8007FC000000000FFF800FF00000000
+00FFF801FE0000000000FFF803FC0000000000FFF80FF80000000000FFF81FF800000000
+00FFF83FFC0000000000FFF8FFFE0000000000FFF9FFFF0000000000FFFBFFFF80000000
+00FFFFFFFF8000000000FFFFFFFFC000000000FFFFCFFFE000000000FFFF87FFF0000000
+00FFFE03FFF800000000FFFC01FFF800000000FFF801FFFC00000000FFF800FFFE000000
+00FFF8007FFF00000000FFF8003FFF80000000FFF8001FFF80000000FFF8001FFFC00000
+00FFF8000FFFE0000000FFF80007FFF0000000FFF80003FFF8000000FFF80001FFFC0000
+00FFF80001FFFC000000FFF80000FFFE000000FFF800007FFF000000FFF800003FFF8000
+00FFF800001FFFC00000FFF800001FFFC00000FFF800000FFFE00000FFF800001FFFF800
+FFFFFFF800FFFFFFE0FFFFFFF800FFFFFFE0FFFFFFF800FFFFFFE0FFFFFFF800FFFFFFE0
+43357DB449>I<0003FFFFFFFFFFFFE00003FFFFFFFFFFFFE00003FFFFFFFFFFFFE00003
+FFFFFFFFFFFFE0000003F00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000003E00003FFE000000003E00003FFE000000003E00003FFE0000000
+03E00003FFE000000007E00003FFE000000007C00003FFE000000007C00003FFE0000000
+07C00003FFE000000007C00003FFE0000F8007C00003FFE0001FC007C00003FFE0003FE0
+0FC00003FFE0007FF00FC00003FFE000FFF80F800003FFE000FFF80F800003FFE000FFF8
+1F800003FFE000FFF81F800003FFE000FFF81F000003FFE000FFF83F000003FFE000FFF0
+7E000003FFE0007FE0FE000003FFE0007FFFFC0003FFFFFFE03FFFF80003FFFFFFE01FFF
+F00003FFFFFFE00FFFE00003FFFFFFE003FF800000000000000030000000000000004337
+7EB449>I<FFFFFC000000007FFFFEFFFFFE00000000FFFFFEFFFFFF00000000FFFFFEFF
+FFFF00000001FFFFFE00FFFF00000001FFFE0000FFFF80000001FFFE0000FFFF80000003
+DFFE0000FBFFC0000003DFFE0000FBFFC00000079FFE0000F9FFE00000079FFE0000F9FF
+E000000F1FFE0000F8FFF000000F1FFE0000F8FFF000000F1FFE0000F8FFF000001E1FFE
+0000F87FF800001E1FFE0000F87FF800003C1FFE0000F83FFC00003C1FFE0000F83FFC00
+00781FFE0000F81FFE0000781FFE0000F81FFE0000F01FFE0000F81FFE0000F01FFE0000
+F80FFF0000F01FFE0000F80FFF0001E01FFE0000F807FF8001E01FFE0000F807FF8003C0
+1FFE0000F803FFC003C01FFE0000F803FFC007801FFE0000F801FFE007801FFE0000F801
+FFE00F001FFE0000F801FFE00F001FFE0000F800FFF00F001FFE0000F800FFF01E001FFE
+0000F8007FF81E001FFE0000F8007FF83C001FFE0000F8003FFC3C001FFE0000F8003FFC
+78001FFE0000F8001FFE78001FFE0000F8001FFE78001FFE0000F8001FFEF0001FFE0000
+F8000FFFF0001FFE0000F8000FFFE0001FFE0000F80007FFE0001FFE0000F80007FFC000
+1FFE0000F80003FFC0001FFE0000F80003FF80001FFE0000F80003FF80001FFE0000F800
+01FF80001FFE0000F80001FF00001FFE0007FF0000FF00001FFE00FFFFF800FE001FFFFF
+FEFFFFF8007E001FFFFFFEFFFFF8007C001FFFFFFEFFFFF8003C001FFFFFFE4F357CB458
+>I<FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFF
+FFC000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFFFFFFFFFFFC00000FFFFFFFFFFFF
+C00000FFFFFFFFFFFFC00000FFFFFFFFFFFFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FF
+C00000FFF8000007FFC000FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFF
+FFC0FFFFFFF807FFFFFFC042357DB449>I<000001FFC000000000003FFFFE0000000000
+FFFFFF8000000003FFFFFFE00000000FFF80FFF80000003FFC001FFE0000007FF00007FF
+000000FFE00003FF800001FFC00001FFC00003FF800000FFE00003FF0000007FE00007FF
+0000007FF0000FFF0000007FF8000FFE0000003FF8001FFE0000003FFC001FFE0000003F
+FC003FFE0000003FFE003FFC0000001FFE003FFC0000001FFE007FFC0000001FFF007FFC
+0000001FFF007FFC0000001FFF007FFC0000001FFF00FFFC0000001FFF80FFFC0000001F
+FF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC
+0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001FFF80FFFC0000001F
+FF80FFFC0000001FFF807FFC0000001FFF007FFC0000001FFF007FFC0000001FFF003FFC
+0000001FFE003FFE0000003FFE003FFE0000003FFE001FFE0000003FFC001FFE0000003F
+FC000FFF0000007FF8000FFF0000007FF80007FF800000FFF00003FF800000FFE00001FF
+C00001FFC00000FFE00003FF8000007FF00007FF0000003FFC001FFE0000001FFF80FFFC
+00000007FFFFFFF000000001FFFFFFC0000000003FFFFE000000000003FFE00000003938
+7CB642>I<FFFFFFFFFFFFFFFFC0FFFFFFFFFFFFFFFFC0FFFFFFFFFFFFFFFFC0FFFFFFFF
+FFFFFFFFC000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF800
+0007FFC00000FFF8000007FFC000FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF8
+07FFFFFFC0FFFFFFF807FFFFFFC042357DB449>I<003FF8007FF0000000FFFFF807FFFF
+000000FFFFF81FFFFFC00000FFFFF87FFFFFF00000FFFFF9FF00FFFC0000FFFFFFF8003F
+FF000003FFFFE0000FFF800000FFFF800007FFC00000FFFF000003FFE00000FFFE000003
+FFF00000FFFC000001FFF00000FFF8000000FFF80000FFF8000000FFFC0000FFF8000000
+7FFC0000FFF80000007FFE0000FFF80000007FFE0000FFF80000003FFE0000FFF8000000
+3FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF8000000
+1FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF8000000
+1FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF8000000
+1FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF80000001FFF8000FFF8000000
+1FFF8000FFF80000003FFF0000FFF80000003FFF0000FFF80000003FFF0000FFF8000000
+3FFF0000FFF80000007FFE0000FFF80000007FFE0000FFF80000007FFC0000FFF8000000
+FFFC0000FFF8000000FFF80000FFFC000001FFF80000FFFC000001FFF00000FFFE000003
+FFE00000FFFF000007FFC00000FFFF80000FFF800000FFFFE0001FFF000000FFFFF0007F
+FE000000FFF9FE01FFF8000000FFF8FFFFFFF0000000FFF83FFFFFC0000000FFF807FFFE
+00000000FFF800FFE000000000FFF800000000000000FFF800000000000000FFF8000000
+00000000FFF800000000000000FFF800000000000000FFF800000000000000FFF8000000
+00000000FFF800000000000000FFF800000000000000FFF800000000000000FFF8000000
+00000000FFF800000000000000FFF800000000000000FFF800000000000000FFF8000000
+00000000FFF800000000000000FFF8000000000000FFFFFFF80000000000FFFFFFF80000
+000000FFFFFFF80000000000FFFFFFF80000000000FFFFFFF80000000000414D7DB549>
+I<000003FFE0000000003FFFFE00000000FFFFFF80000003FFFFFFE000000FFF003FF800
+003FFC0007FC00007FF8000FFE0000FFF0001FFE0001FFE0003FFF0003FFC0003FFF0007
+FF80003FFF0007FF80003FFF000FFF00003FFF001FFF00003FFF001FFE00003FFF003FFE
+00001FFE003FFE00000FFC003FFE000007F8007FFE00000000007FFC00000000007FFC00
+000000007FFC0000000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC0000
+000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC0000000000FFFC000000
+0000FFFC0000000000FFFC0000000000FFFC0000000000FFFC00000000007FFC00000000
+007FFE00000000007FFE00000000007FFE00000000003FFE00000000003FFF0000000000
+1FFF0000000F801FFF0000000F800FFF8000001F800FFF8000001F0007FFC000003F0003
+FFE000003E0001FFF000007E0000FFF80000FC00007FFC0001F800003FFF0007F000000F
+FFC01FE0000007FFFFFF80000001FFFFFE000000003FFFF80000000003FF80000031387C
+B63A>I<7FFFFFFFFFFFFC7FFFFFFFFFFFFC7FFFFFFFFFFFFC7FFFFFFFFFFFFC7FF807FF
+C03FFC7FC007FFC007FC7F8007FFC003FC7F0007FFC001FC7E0007FFC000FC7E0007FFC0
+00FC7C0007FFC0007CFC0007FFC0007EFC0007FFC0007EFC0007FFC0007EF80007FFC000
+3EF80007FFC0003EF80007FFC0003EF80007FFC0003EF80007FFC0003EF80007FFC0003E
+F80007FFC0003E000007FFC00000000007FFC00000000007FFC00000000007FFC0000000
+0007FFC00000000007FFC00000000007FFC00000000007FFC00000000007FFC000000000
+07FFC00000000007FFC00000000007FFC00000000007FFC00000000007FFC00000000007
+FFC00000000007FFC00000000007FFC00000000007FFC00000000007FFC00000000007FF
+C00000000007FFC00000000007FFC00000000007FFC00000000007FFC00000000007FFC0
+0000000007FFC00000000007FFC00000000007FFC00000007FFFFFFFFC00007FFFFFFFFC
+00007FFFFFFFFC00007FFFFFFFFC0037357DB43E>I<FFFFFFE0001FFFFCFFFFFFE0001F
+FFFCFFFFFFE0001FFFFCFFFFFFE0001FFFFC01FFF8000001FF8001FFF8000000FE0000FF
+F80000007C0000FFFC000000FC00007FFC000000F800007FFE000001F800003FFE000001
+F000003FFF000001F000003FFF000003F000001FFF800003E000001FFF800007E000000F
+FF800007C000000FFFC0000FC0000007FFC0000F80000007FFE0001F80000003FFE0001F
+00000003FFF0001F00000003FFF0003F00000001FFF8003E00000001FFF8007E00000000
+FFF8007C00000000FFFC00FC000000007FFC00F8000000007FFE00F8000000007FFE01F8
+000000003FFF01F0000000003FFF03F0000000001FFF03E0000000001FFF87E000000000
+0FFF87C0000000000FFFCFC00000000007FFCF800000000007FFEF800000000007FFFF80
+0000000003FFFF000000000003FFFF000000000001FFFE000000000001FFFE0000000000
+00FFFC000000000000FFFC0000000000007FF80000000000007FF80000000000007FF800
+00000000003FF00000000000003FF00000000000001FE00000000000001FE00000000000
+000FC00000000000000FC00000000000000FC00000000000000F800000000000001F8000
+00000000001F000000000000003F000000000000003E000000000000007E000000001FC0
+007C000000003FE0007C000000007FF000FC00000000FFF800F800000000FFF801F80000
+0000FFF801F000000000FFF803E000000000FFF807E000000000FFF80FC0000000007FF0
+1F80000000007FE03F00000000007FC07F00000000003F81FC00000000001FFFF8000000
+00000FFFF0000000000003FFC0000000000000FE0000000000003E4D7DB445>I<000000
+00003FF8000000000000000000FFFFF8000000000000000000FFFFF80000000000000000
+00FFFFF8000000000000000000FFFFF8000000000000000000FFFFF80000000000000000
+0003FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF80000000000000003FF80FFF80FFE00000000003F
+FFF0FFF87FFFE000000000FFFFFCFFF9FFFFF800000003FFFFFEFFFBFFFFFE0000000FFF
+C03FFFFFE01FFF8000003FFF000FFFFF8007FFE000007FFC0007FFFF0001FFF00000FFF8
+0003FFFE0000FFF80001FFF00001FFFC00007FFC0003FFE00000FFF800003FFE0007FFC0
+0000FFF800001FFF000FFFC00000FFF800001FFF800FFF800000FFF800000FFF801FFF80
+0000FFF800000FFFC01FFF000000FFF8000007FFC03FFF000000FFF8000007FFE03FFF00
+0000FFF8000007FFE07FFE000000FFF8000003FFF07FFE000000FFF8000003FFF07FFE00
+0000FFF8000003FFF07FFE000000FFF8000003FFF0FFFC000000FFF8000001FFF8FFFC00
+0000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC00
+0000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC00
+0000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC00
+0000FFF8000001FFF8FFFC000000FFF8000001FFF8FFFC000000FFF8000001FFF87FFE00
+0000FFF8000003FFF07FFE000000FFF8000003FFF07FFE000000FFF8000003FFF07FFE00
+0000FFF8000003FFF03FFF000000FFF8000007FFE03FFF000000FFF8000007FFE01FFF00
+0000FFF8000007FFC01FFF800000FFF800000FFFC00FFF800000FFF800000FFF800FFFC0
+0000FFF800001FFF8007FFC00000FFF800001FFF0003FFE00001FFFC00003FFE0001FFF0
+0001FFFC00007FFC0000FFF80003FFFE0000FFF800007FFC0007FFFF0001FFF000003FFF
+000FFFFF8007FFE000000FFFC07FFFFFF01FFF80000003FFFFFEFFFBFFFFFE00000000FF
+FFF8FFF8FFFFF8000000003FFFF0FFF87FFFE00000000001FF80FFF80FFC000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF800000000000000000000FFF80000000000000000
+0000FFF800000000000000000000FFF8000000000000000000FFFFFFF800000000000000
+00FFFFFFF80000000000000000FFFFFFF80000000000000000FFFFFFF800000000000000
+00FFFFFFF8000000005D6A7CD266>I<FFFFFFF001FFFFFCFFFFFFF001FFFFFCFFFFFFF0
+01FFFFFCFFFFFFF001FFFFFC00FFFE00001FFE00007FFE00000FF000003FFF00000FE000
+001FFF80001FC000001FFF80001F8000000FFFC0003F00000007FFE0007E00000003FFF0
+00FE00000001FFF801FC00000001FFF803F800000000FFFC03F0000000007FFE07E00000
+00003FFF0FC0000000003FFF1FC0000000001FFFBF80000000000FFFFF000000000007FF
+FE000000000007FFFC000000000003FFF8000000000001FFF8000000000000FFFC000000
+0000007FFE0000000000007FFE0000000000003FFF0000000000003FFF8000000000007F
+FFC00000000000FFFFC00000000000FFFFE00000000001FBFFF00000000003F1FFF80000
+000007F0FFFC000000000FE0FFFC000000001FC07FFE000000001F803FFF000000003F00
+1FFF800000007E001FFF80000000FE000FFFC0000001FC0007FFE0000003F80003FFF000
+0003F00003FFF8000007E00001FFF800000FC00000FFFC00001FC000007FFE00003FC000
+003FFF0001FFE000003FFF00FFFFFE0007FFFFFFFFFFFE0007FFFFFFFFFFFE0007FFFFFF
+FFFFFE0007FFFFFF40357EB445>I<FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC0FFFFFF
+F807FFFFFFC0FFFFFFF807FFFFFFC000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8
+000007FFC00000FFF8000007FFC00000FFF8000007FFC000FFFFFFFFFFFFFFFFE0FFFFFF
+FFFFFFFFFFE0FFFFFFFFFFFFFFFFE0FFFFFFFFFFFFFFFFE000000000000007FFE0000000
+00000000FFE0000000000000003FF0000000000000001FF0000000000000000FF0000000
+0000000007F00000000000000003F00000000000000003F00000000000000003F0000000
+0000000001F00000000000000001F00000000000000001F00000000000000001F0000000
+0000000001F80000000000000000F80000000000000000F80000000000000000F8000000
+0000000000F80000000000000000F845487DB449>I<FFFFFFF807FFFFFFC0FFFFFFF807
+FFFFFFC0FFFFFFF807FFFFFFC0FFFFFFF807FFFFFFC000FFF8000007FFC00000FFF80000
+07FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF80000
+07FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF80000
+07FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF80000
+07FFC00000FFF8000007FFC00000FFF8000007FFC00000FFF8000007FFC000007FF80000
+07FFC000007FFC000007FFC000003FFC00003FFFC000003FFE0000FFFFC000001FFF000F
+FFFFC0000007FFFFFFF7FFC0000001FFFFFF87FFC00000007FFFFC07FFC000000007FFC0
+07FFC000000000000007FFC000000000000007FFC000000000000007FFC0000000000000
+07FFC000000000000007FFC000000000000007FFC000000000000007FFC0000000000000
+07FFC000000000000007FFC000000000000007FFC000000000000007FFC0000000000000
+07FFC000000000000007FFC000000000000007FFC000000000000007FFC0000000000000
+07FFC000000000000007FFC000000000000007FFC000000000000007FFC0000000000007
+FFFFFFC00000000007FFFFFFC00000000007FFFFFFC00000000007FFFFFFC042357DB449
+>I<FFFFFFF81FFFFFFF03FFFFFFE0FFFFFFF81FFFFFFF03FFFFFFE0FFFFFFF81FFFFFFF
+03FFFFFFE0FFFFFFF81FFFFFFF03FFFFFFE000FFF800001FFF000003FFE00000FFF80000
+1FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FF
+F800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE0
+0000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF0000
+03FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001F
+FF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF8
+00001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE000
+00FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003
+FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF
+000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800
+001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000
+FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FF
+E00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF00
+0003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF80000
+1FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FF
+F800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE0
+0000FFF800001FFF000003FFE00000FFF800001FFF000003FFE000FFFFFFFFFFFFFFFFFF
+FFFFFFE0FFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFFFFFFFFFFFFFFFFFFFE0FFFFFFFFFFFF
+FFFFFFFFFFFFE063357CB46C>I<FFFFFFF81FFFFFFF03FFFFFFE0FFFFFFF81FFFFFFF03
+FFFFFFE0FFFFFFF81FFFFFFF03FFFFFFE0FFFFFFF81FFFFFFF03FFFFFFE000FFF800001F
+FF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF8
+00001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE000
+00FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003
+FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF
+000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800
+001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000
+FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FF
+E00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF00
+0003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF80000
+1FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FF
+F800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE0
+0000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF0000
+03FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001F
+FF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF8
+00001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003FFE000
+00FFF800001FFF000003FFE00000FFF800001FFF000003FFE00000FFF800001FFF000003
+FFE000FFFFFFFFFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFF0FFFFFFFFFFFFFF
+FFFFFFFFFFF0FFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000003FFF000000000
+000000000000007FF000000000000000000000001FF800000000000000000000000FF800
+0000000000000000000007F8000000000000000000000003F80000000000000000000000
+01F8000000000000000000000001F8000000000000000000000001F80000000000000000
+00000000F8000000000000000000000000F8000000000000000000000000F80000000000
+00000000000000F8000000000000000000000000FC0000000000000000000000007C0000
+000000000000000000007C0000000000000000000000007C000000000000000000000000
+7C0000000000000000000000007C66487CB46C>I<FFFFFFF80000007FFFFFFCFFFFFFF8
+0000007FFFFFFCFFFFFFF80000007FFFFFFCFFFFFFF80000007FFFFFFC00FFF800000000
+007FFC0000FFF800000000007FFC0000FFF800000000007FFC0000FFF800000000007FFC
+0000FFF800000000007FFC0000FFF800000000007FFC0000FFF800000000007FFC0000FF
+F800000000007FFC0000FFF800000000007FFC0000FFF800000000007FFC0000FFF80000
+0000007FFC0000FFF800000000007FFC0000FFF800000000007FFC0000FFF80000000000
+7FFC0000FFF800000000007FFC0000FFF800000000007FFC0000FFF800000000007FFC00
+00FFF800000000007FFC0000FFFFFFF80000007FFC0000FFFFFFFFF000007FFC0000FFFF
+FFFFFE00007FFC0000FFFFFFFFFF80007FFC0000FFF8001FFFE0007FFC0000FFF80007FF
+F0007FFC0000FFF80001FFF8007FFC0000FFF80000FFFC007FFC0000FFF800007FFE007F
+FC0000FFF800007FFE007FFC0000FFF800003FFF007FFC0000FFF800003FFF007FFC0000
+FFF800001FFF807FFC0000FFF800001FFF807FFC0000FFF800001FFF807FFC0000FFF800
+001FFF807FFC0000FFF800001FFF807FFC0000FFF800001FFF807FFC0000FFF800001FFF
+807FFC0000FFF800003FFF007FFC0000FFF800003FFF007FFC0000FFF800007FFE007FFC
+0000FFF800007FFE007FFC0000FFF80000FFFC007FFC0000FFF80001FFF8007FFC0000FF
+F80007FFF0007FFC0000FFF8001FFFE0007FFC00FFFFFFFFFFFFC07FFFFFFCFFFFFFFFFF
+FF007FFFFFFCFFFFFFFFFFF8007FFFFFFCFFFFFFFFFF80007FFFFFFC56357CB45F>251
+D<FFFFFFF800000000FFFFFFF800000000FFFFFFF800000000FFFFFFF80000000000FFF8
+000000000000FFF8000000000000FFF8000000000000FFF8000000000000FFF800000000
+0000FFF8000000000000FFF8000000000000FFF8000000000000FFF8000000000000FFF8
+000000000000FFF8000000000000FFF8000000000000FFF8000000000000FFF800000000
+0000FFF8000000000000FFF8000000000000FFF8000000000000FFF8000000000000FFFF
+FFF800000000FFFFFFFFF0000000FFFFFFFFFE000000FFFFFFFFFF800000FFF8001FFFE0
+0000FFF80007FFF00000FFF80001FFF80000FFF80000FFFC0000FFF800007FFE0000FFF8
+00007FFE0000FFF800003FFF0000FFF800003FFF0000FFF800001FFF8000FFF800001FFF
+8000FFF800001FFF8000FFF800001FFF8000FFF800001FFF8000FFF800001FFF8000FFF8
+00001FFF8000FFF800003FFF0000FFF800003FFF0000FFF800007FFE0000FFF800007FFE
+0000FFF80000FFFC0000FFF80001FFF80000FFF80007FFF00000FFF8001FFFE000FFFFFF
+FFFFFFC000FFFFFFFFFFFF0000FFFFFFFFFFF80000FFFFFFFFFF80000039357CB442>I<
+000001FFFFFFFFFE00007FFFFFFFFFFE0003FFFFFFFFFFFE000FFFFFFFFFFFFE003FFFC0
+003FFE00007FFE00003FFE0000FFF800003FFE0001FFF000003FFE0003FFF000003FFE00
+03FFE000003FFE0007FFE000003FFE0007FFE000003FFE0007FFE000003FFE0007FFE000
+003FFE0007FFE000003FFE0007FFE000003FFE0003FFE000003FFE0003FFF000003FFE00
+01FFF000003FFE0001FFF800003FFE0000FFF800003FFE00007FFE00003FFE00001FFFC0
+003FFE000007FFFFFFFFFE000001FFFFFFFFFE0000001FFFFFFFFE00000001FFFFFFFE00
+000001FFFC3FFE00000003FFF83FFE00000007FFF83FFE0000000FFFF03FFE0000000FFF
+E03FFE0000001FFFC03FFE0000003FFFC03FFE0000007FFF803FFE0000007FFF003FFE00
+0000FFFF003FFE000001FFFE003FFE000003FFFC003FFE000003FFF8003FFE000007FFF8
+003FFE00000FFFF0003FFE00001FFFE0003FFE00001FFFE0003FFE00003FFFC0003FFE00
+007FFF80003FFE0000FFFF00003FFE0001FFFF00003FFE0007FFFF00003FFE00FFFFFFF8
+3FFFFFFEFFFFFFF83FFFFFFEFFFFFFF83FFFFFFEFFFFFFF83FFFFFFE3F357EB445>255
+D E
+%EndDVIPSBitmapFont
+%DVIPSBitmapFont: Fi larm1000 10 82
+/Fi 82 256 df<01800060038000E0070001C00E0003801C0007001800060038000E0030
+000C0070001C006000180060001800E0003800C0003000C0003000C0003000C0003000CE
+003380FF803FE0FFC03FF0FFC03FF0FFC03FF07FC01FF07FC01FF03F800FE00E0003801C
+1981B91C>16 D<1C0007007F001FC0FF803FE0FF803FE0FFC03FF0FFC03FF0FFC03FF07F
+C01FF01CC0073000C0003000C0003000C0003000C0003001C00070018000600180006003
+8000E0030000C0070001C0060001800E0003801C00070038000E0070001C00600018001C
+1980B91C>I<FFFFFFFFFF80FFFFFFFFFF80290280962A>21 D<0000600000E00001C000
+0380000700000E00001E00003C0000780000780000F00001E00001E00003C00003C00007
+C0000780000F80000F00000F00001F00001E00001E00003E00003E00003E00007C00007C
+00007C00007C00007C00007C0000F80000F80000F80000F80000F80000F80000F80000F8
+0000F80000F80000F80000F80000F80000F80000F80000F80000F80000F800007C00007C
+00007C00007C00007C00007C00003E00003E00003E00001E00001E00001F00000F00000F
+00000F800007800007C00003C00003C00001E00001E00000F000007800007800003C0000
+1E00000E000007000003800001C00000E0000060135278BD20>40
+D<C00000E000007000003800001C00000E00000F000007800003C00003C00001E00000F0
+0000F000007800007800007C00003C00003E00001E00001E00001F00000F00000F00000F
+80000F80000F800007C00007C00007C00007C00007C00007C00003E00003E00003E00003
+E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003E00003
+E00003E00003E00007C00007C00007C00007C00007C00007C0000F80000F80000F80000F
+00000F00001F00001E00001E00003E00003C00007C0000780000780000F00000F00001E0
+0003C00003C0000780000F00000E00001C0000380000700000E00000C0000013527CBD20
+>I<1C007F00FF80FF80FFC0FFC0FFC07FC01CC000C000C000C000C001C0018001800380
+0300070006000E001C003800700060000A19798817>44 D<FFFFFCFFFFFCFFFFFCFFFFFC
+FFFFFC16057F941C>I<1C007F00FF80FF80FF80FF80FF807F001C000909798817>I<0001
+C0000003C0000007C000001FC00000FFC000FFFFC000FFFFC000FF1FC000001FC000001F
+C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
+C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
+C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
+C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
+C000001FC000001FC000001FC000001FC000001FC000003FE0007FFFFFF07FFFFFF07FFF
+FFF01C3779B62A>49 D<000FF00000007FFE000001FFFF800003E03FE0000F000FF0001E
+0007F8001C0003FC00380001FE00700001FE00700000FF00600000FF00FE0000FF00FF00
+007F80FF80007F80FF80007F80FF80007F80FF80007F80FF80007F807F00007F801C0000
+7F800000007F80000000FF00000000FF00000000FE00000001FE00000001FC00000003FC
+00000003F800000007F00000000FE00000000FC00000001F800000003F000000007E0000
+0000FC00000001F800000001E000000003C000000007800000000F000000001E00018000
+3C000180007800018000F000038001E000030003C0000300078000030007000007000FFF
+FFFF001FFFFFFF003FFFFFFF007FFFFFFE00FFFFFFFE00FFFFFFFE00FFFFFFFE0021377C
+B62A>I<0007F80000003FFF000000FFFFC00001F80FF00003C007F800078003FC000E00
+01FE000F8001FE001FE000FF001FF000FF001FF000FF001FF000FF001FF000FF001FF000
+FF000FE000FF0007C000FF00000001FE00000001FE00000001FC00000003FC00000003F8
+00000007F000000007E00000000F800000007F0000001FFC0000001FFF800000000FE000
+000007F000000001FC00000001FE00000000FF000000007F800000007F800000007FC000
+00007FC00000003FC00000003FE00000003FE01E00003FE07F80003FE07F80003FE0FFC0
+003FE0FFC0003FE0FFC0003FE0FFC0003FC0FFC0007FC0FF80007F807E00007F80700000
+FF00380001FE001E0001FE000F8003F80007F00FF00001FFFFC000007FFF0000000FF800
+0023397DB62A>I<000000380000000038000000007800000000F800000000F800000001
+F800000003F800000007F800000007F80000000FF80000001FF80000001BF800000033F8
+00000073F800000063F8000000C3F8000001C3F800000183F800000303F800000703F800
+000603F800000C03F800001C03F800001803F800003003F800007003F800006003F80000
+C003F80001C003F800038003F800030003F800070003F8000E0003F8000C0003F8001800
+03F800380003F800300003F800600003F800E00003F800FFFFFFFFF8FFFFFFFFF8FFFFFF
+FFF8000003F800000003F800000003F800000003F800000003F800000003F800000003F8
+00000003F800000003F800000003F800000007FC000003FFFFF80003FFFFF80003FFFFF8
+25387EB72A>I<0600000C000780003C0007F003F80007FFFFF80007FFFFF00007FFFFE0
+0007FFFF800007FFFF000007FFFC0000067FE00000060000000006000000000600000000
+060000000006000000000600000000060000000006000000000600000000060000000006
+07F80000061FFE000006780F800006E007E00007C003F000078001F800070001F8000600
+00FC00060000FE00000000FE00000000FF000000007F000000007F000000007F80000000
+7F800000007F800000007F801C00007F807F00007F80FF00007F80FF80007F80FF80007F
+80FF80007F80FF00007F00FF0000FF00FC0000FF00600000FE00700000FE00700001FC00
+380001F8001C0003F8001E0007F0000F800FE00007E03F800001FFFF0000007FFC000000
+1FE0000021397CB62A>I<00003FC0000001FFF0000007FFFC00000FE03E00003F800700
+007E001F0000FC003F8001F8007F8003F0007F8007F0007F8007E0007F800FE0003F000F
+C0001E001FC00000001F800000003F800000003F800000003F800000007F800000007F00
+0000007F01FC00007F07FF8000FF1E07E000FF3801F000FF7000F800FF6000FC00FFE000
+7E00FFC0003F00FFC0003F80FF80003F80FF80001FC0FF80001FC0FF80001FC0FF00001F
+E0FF00001FE0FF00001FE0FF00001FE0FF00001FE07F00001FE07F00001FE07F00001FE0
+7F00001FE07F80001FE03F80001FE03F80001FC03F80001FC01F80003F801FC0003F800F
+C0003F000FE0007F0007E000FE0003F000FC0001F801F80000FE07F000007FFFC000001F
+FF00000003FC000023397DB62A>I<0003F80000001FFF0000007FFFC00001FC07E00003
+F803F00007E001F8000FE000FC001FC0007E001F80007E003F80003F003F80003F007F00
+003F807F00003F80FF00003F80FF00001FC0FF00001FC0FF00001FC0FF00001FC0FF0000
+1FC0FF00001FE0FF00001FE0FF00001FE0FF00001FE0FF00001FE07F00003FE07F00003F
+E07F00003FE03F80003FE03F80007FE01F80007FE00FC000FFE007E000DFE003E001DFE0
+01F0039FE000FC0F1FE0003FFC1FC00007F01FC00000001FC00000001FC00000003FC000
+00003F800000003F800000003F000000007F000F00007F001F80007E003FC000FC003FC0
+00FC003FC001F8003FC003F0003F8007E0001F000FE0001C001F80000F807F000007FFFE
+000001FFF80000003FC0000023397DB62A>57 D<1C007F00FF80FF80FF80FF80FF807F00
+1C0000000000000000000000000000000000000000000000000000000000000000000000
+00001C007F00FF80FF80FF80FF80FF807F001C00092479A317>I<FFFFFFFFC00000FFFF
+FFFFF80000FFFFFFFFFE000001FF8001FF800000FF00003FE00000FF00000FF00000FF00
+0003F80000FF000001FC0000FF000000FE0000FF0000007F0000FF0000007F0000FF0000
+003F8000FF0000003FC000FF0000001FC000FF0000001FE000FF0000000FE000FF000000
+0FF000FF0000000FF000FF0000000FF000FF00000007F800FF00000007F800FF00000007
+F800FF00000007F800FF00000007FC00FF00000007FC00FF00000007FC00FF00000007FC
+00FF00000007FC00FF00000007FC00FF00000007FC00FF00000007FC00FF00000007FC00
+FF00000007FC00FF00000007FC00FF00000007FC00FF00000007F800FF00000007F800FF
+00000007F800FF00000007F800FF0000000FF000FF0000000FF000FF0000000FE000FF00
+00000FE000FF0000001FE000FF0000001FC000FF0000003F8000FF0000003F8000FF0000
+007F0000FF000000FE0000FF000001FC0000FF000003F80000FF00000FF00000FF00003F
+E00001FF8000FF8000FFFFFFFFFF0000FFFFFFFFF80000FFFFFFFFC0000036397DB83F>
+68 D<FFFFFFFFFFFE00FFFFFFFFFFFE00FFFFFFFFFFFE0001FF800007FE0000FF000000
+FE0000FF0000003F0000FF0000001F0000FF0000000F0000FF000000070000FF00000007
+0000FF000000070000FF000000030000FF000000030000FF000000030000FF0000000380
+00FF000000018000FF0000C0018000FF0000C0018000FF0000C0018000FF0000C0000000
+FF0000C0000000FF0000C0000000FF0001C0000000FF0001C0000000FF0003C0000000FF
+000FC0000000FFFFFFC0000000FFFFFFC0000000FFFFFFC0000000FF000FC0000000FF00
+03C0000000FF0001C0000000FF0001C0000000FF0000C0000000FF0000C0000000FF0000
+C0006000FF0000C0006000FF0000C0006000FF0000C000E000FF00000000C000FF000000
+00C000FF00000000C000FF00000000C000FF00000001C000FF00000001C000FF00000001
+C000FF000000038000FF000000038000FF000000078000FF000000078000FF0000000F80
+00FF0000003F8000FF0000007F8001FF800007FF00FFFFFFFFFFFF00FFFFFFFFFFFF00FF
+FFFFFFFFFF0033397EB838>I<000000FF8000C000000FFFF001C000003FFFFC01C00000
+FF803F03C00003FC000787C0000FF00003CFC0001FE00000EFC0003FC000007FC0007F80
+00003FC000FF0000001FC001FE0000001FC003FC0000000FC007F800000007C007F80000
+0007C00FF000000003C00FF000000003C01FE000000003C01FE000000001C03FE0000000
+01C03FC000000001C07FC000000000C07FC000000000C07FC000000000C07FC000000000
+C0FF800000000000FF800000000000FF800000000000FF800000000000FF800000000000
+FF800000000000FF800000000000FF800000000000FF800000000000FF800000000000FF
+800000000000FF800000FFFFFFFF800000FFFFFF7FC00000FFFFFF7FC00000007FE07FC0
+0000003FC07FC00000003FC03FC00000003FC03FE00000003FC01FE00000003FC01FE000
+00003FC00FF00000003FC00FF00000003FC007F80000003FC007F80000003FC003FC0000
+003FC001FE0000003FC000FF0000007FC0007F8000007FC0003FC00000FFC0001FE00000
+EFC0000FF80003C7C00003FE000783C00000FFC03F01C000003FFFFC00C000000FFFF000
+00000000FF800000383D7CBA41>71 D<FFFFFF01FFFFFEFFFFFF01FFFFFEFFFFFF01FFFF
+FE01FF800003FF0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE00
+00FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000
+FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF
+000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF00
+0001FE0000FF000001FE0000FF000001FE0000FFFFFFFFFE0000FFFFFFFFFE0000FFFFFF
+FFFE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001
+FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE
+0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE00
+00FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0000
+FF000001FE0000FF000001FE0000FF000001FE0000FF000001FE0001FF800003FF00FFFF
+FF01FFFFFEFFFFFF01FFFFFEFFFFFF01FFFFFE37397DB83E>I<FFFFFFE00000FFFFFFE0
+0000FFFFFFE0000001FFC000000000FF0000000000FF0000000000FF0000000000FF0000
+000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000
+000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000
+000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000
+000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000000000FF0000
+000000FF0000000000FF0000000000FF0000000000FF0000001800FF0000001800FF0000
+001800FF0000001800FF0000001800FF0000003800FF0000003000FF0000003000FF0000
+003000FF0000007000FF0000007000FF0000007000FF000000F000FF000000F000FF0000
+01F000FF000003F000FF00000FF000FF00001FE001FF8000FFE0FFFFFFFFFFE0FFFFFFFF
+FFE0FFFFFFFFFFE02D397DB834>76 D<FFFF0000000007FFF8FFFF800000000FFFF8FFFF
+800000000FFFF801FF800000000FFC0000DFC00000001BF80000DFC00000001BF80000CF
+E000000033F80000CFE000000033F80000CFE000000033F80000C7F000000063F80000C7
+F000000063F80000C7F000000063F80000C3F8000000C3F80000C3F8000000C3F80000C1
+FC00000183F80000C1FC00000183F80000C1FC00000183F80000C0FE00000303F80000C0
+FE00000303F80000C07F00000603F80000C07F00000603F80000C07F00000603F80000C0
+3F80000C03F80000C03F80000C03F80000C03F80000C03F80000C01FC0001803F80000C0
+1FC0001803F80000C00FE0003003F80000C00FE0003003F80000C00FE0003003F80000C0
+07F0006003F80000C007F0006003F80000C003F800C003F80000C003F800C003F80000C0
+03F800C003F80000C001FC018003F80000C001FC018003F80000C001FC018003F80000C0
+00FE030003F80000C000FE030003F80000C0007F060003F80000C0007F060003F80000C0
+007F060003F80000C0003F8C0003F80000C0003F8C0003F80000C0001FD80003F80000C0
+001FD80003F80000C0001FD80003F80000C0000FF00003F80000C0000FF00003F80000C0
+000FF00003F80001E00007E00003F80003F00007E00003F8000FFC0003C00007FC00FFFF
+C003C003FFFFF8FFFFC003C003FFFFF8FFFFC0018003FFFFF845397DB84C>I<FFFF0000
+07FFFEFFFF800007FFFEFFFFC00007FFFE00FFC000007FE000FFE000001F8000DFF00000
+0F0000DFF00000060000CFF80000060000C7FC0000060000C7FC0000060000C3FE000006
+0000C1FF0000060000C1FF0000060000C0FF8000060000C07FC000060000C07FC0000600
+00C03FE000060000C01FF000060000C01FF800060000C00FF800060000C007FC00060000
+C007FE00060000C003FE00060000C001FF00060000C001FF80060000C000FF80060000C0
+007FC0060000C0007FE0060000C0003FE0060000C0001FF0060000C0000FF8060000C000
+0FF8060000C00007FC060000C00003FE060000C00003FE060000C00001FF060000C00000
+FF860000C00000FF860000C000007FC60000C000003FE60000C000003FE60000C000001F
+F60000C000000FFE0000C000000FFE0000C0000007FE0000C0000003FE0000C0000003FE
+0000C0000001FE0000C0000000FE0000C0000000FE0000C00000007E0001E00000003E00
+03F00000003E000FFC0000001E00FFFFC000000E00FFFFC000000E00FFFFC00000060037
+397DB83E>I<FFFFFF0007FFFEFFFFFF0007FFFEFFFFFF0007FFFE01FF8000007FE000FF
+0000001F8000FF0000000F0000FF000000060000FF000000060000FF000000060000FF00
+0000060000FF000000060000FF000000060000FF000000060000FF000000060000FF0000
+00060000FF000000060000FF000000060000FF000000060000FF000000060000FF000000
+060000FF000000060000FF000000060000FF000000060000FF000000060000FF00000006
+0000FF000000060000FF000000060000FF000000060000FF000000060000FF0000000600
+00FF000000060000FF000000060000FF000000060000FF000000060000FF000000060000
+FF000000060000FF000000060000FF000000060000FF000000060000FF000000060000FF
+000000060000FF000000060000FF0000000E00007F0000000C00007F8000000C00007F80
+00001C00003F8000001C00003F8000001800001FC000003800001FC000007000000FE000
+00F0000007F00000E0000003F80001C0000001FC000780000000FE000F000000007F807E
+000000001FFFF80000000007FFE000000000007F800000373B7DB83E>85
+D<7FFFFF003FFFFC007FFFFF003FFFFC007FFFFF003FFFFC0000FFF80007FF8000007FE0
+0003FC0000003FE00001F00000001FF00001E00000001FF00001C00000000FF800018000
+000007FC00038000000007FC00070000000003FE00060000000003FE000E0000000001FF
+001C0000000000FF80180000000000FF803800000000007FC03000000000003FE0600000
+0000003FE0E000000000001FF0C000000000000FF18000000000000FFB80000000000007
+FF00000000000007FE00000000000003FE00000000000001FF00000000000001FF000000
+00000000FF800000000000007FC00000000000007FC0000000000000FFE0000000000000
+DFE00000000000019FF00000000000038FF80000000000030FF800000000000607FC0000
+0000000E03FE00000000000C03FE00000000001801FF00000000003800FF000000000030
+00FF800000000060007FC000000000E0007FC000000000C0003FE00000000180001FF000
+00000380001FF00000000300000FF800000006000007FC0000000E000007FC0000000C00
+0003FE0000001C000001FE0000003C000001FF000000FE000001FF800007FF800007FFE0
+00FFFFE0003FFFFF80FFFFE0003FFFFF80FFFFE0003FFFFF8039397EB83E>88
+D<001FE0000000FFFC000003E03F000007000F80000F8007E0001FC003F0001FE003F000
+1FE001F8001FE001F8001FE000FC000FC000FC00078000FC00000000FC00000000FC0000
+0000FC00000000FC0000007FFC000007FFFC00003FE0FC0000FE00FC0003F800FC000FF0
+00FC001FC000FC003FC000FC007F8000FC007F0000FC007F0000FC0CFE0000FC0CFE0000
+FC0CFE0000FC0CFE0001FC0CFE0001FC0CFF0003FC0C7F00077C0C7F80063E183FC01E3E
+180FE0781FF003FFF00FE0007F8007C026277DA52A>97 D<0003FC00001FFF80007E03E0
+01F8007003F000F807E001FC0FC003FC0FC003FC1F8003FC3F8003FC3F0001F87F0000F0
+7F0000007F0000007E000000FE000000FE000000FE000000FE000000FE000000FE000000
+FE000000FE000000FE000000FE0000007E0000007F0000007F0000003F0000063F800006
+1F80000E1FC0000C0FC0001C07E0003803F0007001F800E0007C07C0001FFF000007F800
+1F277DA525>99 D<0000000FC0000003FFC0000003FFC0000003FFC00000003FC0000000
+0FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000F
+C00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC0
+0000000FC00003F80FC0001FFF0FC0007E078FC000F801EFC003F0007FC007E0003FC00F
+C0001FC00FC0001FC01F80000FC03F80000FC03F00000FC07F00000FC07F00000FC07E00
+000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE0000
+0FC0FE00000FC0FE00000FC0FE00000FC07E00000FC07F00000FC07F00000FC03F00000F
+C03F00000FC01F80001FC01F80001FC00FC0003FC007E0007FC003F000EFF001F801CFFF
+007C078FFF001FFE0FFF0007F80FC0283B7DB92E>I<0007F800001FFF00007C0FC001F8
+03E003F001F007E001F80FC000F81F80007C1F80007C3F00007E3F00003E7F00003E7F00
+003F7E00003FFE00003FFE00003FFE00003FFFFFFFFFFFFFFFFFFE000000FE000000FE00
+0000FE000000FE0000007E0000007E0000007F0000007F0000003F0000033F8000031F80
+00070FC0000607C0000E07E0001C01F0003800F80070007E03E0001FFF800003FC002027
+7EA525>I<00007E000003FF80000FC1E0001F87E0003F0FF0007E0FF0007E0FF000FC0F
+F000FC0FF001F803C001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F8000001F8000001F8000001F8000001F80000FFFFFC00FFFFFC00FFFFFC
+0001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F8000003FC00007FFFF8007FFFF8007FFFF8001C3B7FBA19>I<00000003
+F0000FF00FF8003FFC3C3C00F81F707C01F00FE07C03E007C07C07C003E0100FC003F000
+0FC003F0001F8001F8001F8001F8001F8001F8001F8001F8001F8001F8001F8001F8001F
+8001F8001F8001F8000FC003F0000FC003F00007C003E00003E007C00003F00F800003F8
+1F0000073FFC0000060FF000000E000000000E000000000E000000000E000000000F0000
+00000F000000000FC000000007FFFFC00007FFFFF80003FFFFFE0001FFFFFF8003FFFFFF
+C00F80007FE01F00000FF03E000003F07C000001F07C000001F8F8000000F8F8000000F8
+F8000000F8F8000000F8F8000000F8FC000001F87C000001F03E000003E03F000007E00F
+80000F8007E0003F0001FC01FC00007FFFF0000007FF000026387EA52A>I<0380000FE0
+001FF0001FF0001FF0001FF0001FF0000FE0000380000000000000000000000000000000
+0000000000000000000000000000000003F000FFF000FFF000FFF00007F00003F00003F0
+0003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00007F800FFFFC0FFFFC0FFFFC012387EB717>105
+D<03F000FFF000FFF000FFF0000FF00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F00003F0
+0003F00003F00003F00003F00003F00003F00007F800FFFFC0FFFFC0FFFFC0123A7EB917
+>108 D<03F00FF0001FE000FFF03FFC007FF800FFF0F03F01E07E00FFF1C01F83803F00
+0FF3800FC7001F8003F7000FCE001F8003FE000FDC001F8003FC0007F8000FC003FC0007
+F8000FC003F80007F0000FC003F80007F0000FC003F80007F0000FC003F00007E0000FC0
+03F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007
+E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC0
+03F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007
+E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC003F00007E0000FC0
+03F00007E0000FC003F00007E0000FC007F8000FF0001FE0FFFFC1FFFF83FFFFFFFFC1FF
+FF83FFFFFFFFC1FFFF83FFFF40257EA445>I<0003FE0000000FFF8000003E03E00000F8
+00F80001F0007C0003E0003E0007C0001F000F80000F801F80000FC01F000007C03F0000
+07E03F000007E07E000003F07E000003F07E000003F07E000003F0FE000003F8FE000003
+F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8
+7E000003F07E000003F07F000007F03F000007E03F000007E01F80000FC00F80000F800F
+C0001F8007E0003F0003F0007E0000F800F800007E03F000001FFFC0000003FE00002527
+7EA52A>111 D<03F01FE000FFF07FF800FFF1E07E00FFF3801F8007F7000FC003FE0007
+E003FC0003F003F80003F803F00001F803F00001FC03F00000FC03F00000FE03F00000FE
+03F00000FE03F000007F03F000007F03F000007F03F000007F03F000007F03F000007F03
+F000007F03F000007F03F000007F03F000007F03F00000FE03F00000FE03F00000FE03F0
+0001FC03F00001FC03F80003F803F80003F003FC0007F003FE000FE003F6000FC003F780
+3F0003F1E07E0003F0FFF80003F01FC00003F000000003F000000003F000000003F00000
+0003F000000003F000000003F000000003F000000003F000000003F000000003F0000000
+07F8000000FFFFC00000FFFFC00000FFFFC0000028357EA42E>I<0003F800C0001FFE01
+C0007E0781C000FC01C3C003F000E3C007F00077C00FE00037C00FC0003FC01FC0001FC0
+3F80001FC03F80000FC07F00000FC07F00000FC07F00000FC0FE00000FC0FE00000FC0FE
+00000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE00000FC0FE00
+000FC07F00000FC07F00000FC07F00000FC03F00000FC03F80001FC01F80001FC01FC000
+3FC00FC0003FC007E0007FC003F000EFC001F801CFC0007E078FC0001FFE0FC00007F80F
+C00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC00000000FC0
+0000000FC00000000FC00000000FC00000000FC00000001FE0000003FFFF000003FFFF00
+0003FFFF28357DA42C>I<07E01F00FFE07FC0FFE1E3E0FFE387F00FE707F003E607F003
+EE07F003EC03E003FC008003F8000003F8000003F8000003F8000003F0000003F0000003
+F0000003F0000003F0000003F0000003F0000003F0000003F0000003F0000003F0000003
+F0000003F0000003F0000003F0000003F0000003F0000003F0000003F0000003F0000007
+F80000FFFFF000FFFFF000FFFFF0001C257EA421>I<00FF030003FFE7000F80FF001E00
+3F003C001F0078000F0070000700F0000700F0000700F0000300F8000300F8000300FC00
+0300FF0000007FE000007FFF00003FFFE0001FFFF8000FFFFC0003FFFE0000FFFF000007
+FF8000007F8000001F80C0000FC0C00007C0C00007C0E00003C0E00003C0E00003C0F000
+03C0F0000380F8000780FC000780FC000F00FF001E00F3C07C00E1FFF000C03F80001A27
+7DA521>I<00180000001800000018000000180000001800000038000000380000003800
+0000780000007800000078000000F8000001F8000003F8000007F800001FFFFF00FFFFFF
+00FFFFFF0001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F8000001F800
+0001F8000001F800C001F800C001F800C001F800C001F800C001F800C001F800C001F800
+C001F800C000FC01C000FC0180007C0380007E0300003F0700000FFE000001F8001A347F
+B220>I<03F00007E000FFF001FFE000FFF001FFE000FFF001FFE0000FF0001FE00003F0
+0007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F0
+0007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F0
+0007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F0
+0007E00003F00007E00003F00007E00003F00007E00003F0000FE00003F0000FE00003F0
+000FE00003F0001FE00001F0001FE00001F8003FE00000F80077F80000FC00E7FF80003F
+03C7FF80001FFF87FF800003FC07E00029267EA42E>I<FFFF807FFF00FFFF807FFF00FF
+FF807FFF0003FE003FF00001FE001F800000FE001F0000007E001C0000003F0018000000
+1F80300000001FC0700000000FC0E000000007E0C000000007F18000000003FB80000000
+01FF0000000000FE0000000000FE00000000007F00000000003F00000000007F80000000
+007FC000000000CFC000000001C7E00000000383F00000000703F80000000601F8000000
+0C00FC0000001C007E00000038007F00000078003F000000F0001F800001F8001FC0000F
+F8003FF000FFFE00FFFF80FFFE00FFFF80FFFE00FFFF8029247FA32C>120
+D<FFFF803FFEFFFF803FFEFFFF803FFE0FF8000FF007F00007C003F000038001F8000380
+01F800030001FC00030000FC00060000FC000600007E000C00007E000C00007F000C0000
+3F001800003F001800001F803000001F803000001FC07000000FC06000000FC060000007
+E0C0000007E0C0000007F1C0000003F180000003F180000001FB00000001FB00000001FF
+00000000FE00000000FE000000007C000000007C000000007C0000000038000000003800
+00000030000000003000000000700000000060000000006000000000C000000000C00000
+7C01C00000FE01800000FE03800000FE03000000FE06000000FC0E000000701C00000038
+380000001FF00000000FC000000027357EA32C>I<FFFFFFFFE00000FFFFFFFFFC0000FF
+FFFFFFFF000001FF80007FC00000FF00001FE00000FF00000FF00000FF000007F80000FF
+000003FC0000FF000003FC0000FF000001FE0000FF000001FE0000FF000001FF0000FF00
+0001FF0000FF000001FF0000FF000001FF0000FF000001FF0000FF000001FF0000FF0000
+01FF0000FF000001FE0000FF000003FE0000FF000003FC0000FF000007F80000FF00000F
+F00000FF00001FE00000FF00003FC00000FF0000FF800000FFFFFFFC000000FFFFFFFC00
+0000FF00007F800000FF00001FE00000FF000007F00000FF000003F80000FF000001FC00
+00FF000001FE0000FF000000FF0000FF000000FF0000FF000000FF8000FF0000007F8000
+FF0000007FC000FF0000007FC000FF0000007FC000FF0000007FC000FF0000007FC000FF
+0000007FC000FF0000007FC000FF0000007F8000FF000000FF8000FF000000FF8000FF00
+0001FF0000FF000001FE0000FF000003FE0000FF000007FC0000FF00001FF80001FF8000
+7FF000FFFFFFFFFFC000FFFFFFFFFF0000FFFFFFFFF8000032397DB83B>194
+D<0003FFFFFFFFFFF80003FFFFFFFFFFF80003FFFFFFFFFFF8000003C0000FFC00000001
+800007F800000001800007F800000001800007F800000001800007F800000001800007F8
+00000001800007F800000001800007F800000001800007F800000001800007F800000001
+800007F800000001800007F800000001800007F800000001800007F800000001000007F8
+00000003000007F800000003000007F800000003000007F800000003000007F800000003
+000007F800000003000007F800000003000007F800000003000007F800000006000007F8
+00000006000007F800000006000007F800000006000007F800000006000007F80000000C
+000007F80000000C000007F80000000C000007F80000000C000007F800000018000007F8
+00000018000007F800000018000007F800000030000007F800000030000007F800000030
+000007F800000060000007F800000060000007F8000000C0000007F8000000C0000007F8
+00000180000007F800000380000007F800000300000007F800000600000007F800000E00
+000007F800001C00000007F800003800000007F800007800000007F80000F80000000FFC
+003FFFFFFFFFFFFFFC3FFFFFFFFFFFFFFC3FFFFFFFFFFFFFFC3FE00000000007FC3F0000
+00000000FC7C0000000000003E780000000000001E780000000000001E70000000000000
+0E700000000000000E600000000000000660000000000000066000000000000006600000
+0000000006E000000000000007C000000000000003C000000000000003C0000000000000
+03C000000000000003404980B841>196 D<FFFFFFFFFFFE00FFFFFFFFFFFE00FFFFFFFF
+FFFE0001FF800007FE0000FF000000FE0000FF0000003F0000FF0000001F0000FF000000
+0F0000FF000000070000FF000000070000FF000000070000FF000000030000FF00000003
+0000FF000000030000FF000000038000FF000000018000FF0000C0018000FF0000C00180
+00FF0000C0018000FF0000C0000000FF0000C0000000FF0000C0000000FF0001C0000000
+FF0001C0000000FF0003C0000000FF000FC0000000FFFFFFC0000000FFFFFFC0000000FF
+FFFFC0000000FF000FC0000000FF0003C0000000FF0001C0000000FF0001C0000000FF00
+00C0000000FF0000C0000000FF0000C0006000FF0000C0006000FF0000C0006000FF0000
+C000E000FF00000000C000FF00000000C000FF00000000C000FF00000000C000FF000000
+01C000FF00000001C000FF00000001C000FF000000038000FF000000038000FF00000007
+8000FF000000078000FF0000000F8000FF0000003F8000FF0000007F8001FF800007FF00
+FFFFFFFFFFFF00FFFFFFFFFFFF00FFFFFFFFFFFF0033397EB838>I<FFFFFF0001FFFF00
+FFFFFF0001FFFF00FFFFFF0001FFFF0001FF8000007FF00000FF0000003F800000FF0000
+003E000000FF0000003C000000FF00000038000000FF00000070000000FF000000E00000
+00FF000001C0000000FF00000380000000FF00000700000000FF00000E00000000FF0000
+1C00000000FF00003800000000FF00007000000000FF0000E000000000FF0001C0000000
+00FF00078000000000FF000E0000000000FF001C0000000000FF003E0000000000FF007E
+0000000000FF00FF0000000000FF01FF0000000000FF03FF8000000000FF077FC0000000
+00FF0E7FC000000000FF1C3FE000000000FF381FF000000000FF701FF000000000FFE00F
+F800000000FFC007FC00000000FF8007FC00000000FF0003FE00000000FF0001FF000000
+00FF0001FF00000000FF0000FF80000000FF00007FC0000000FF00007FC0000000FF0000
+3FE0000000FF00001FF0000000FF00001FF0000000FF00000FF8000000FF00000FF80000
+00FF000007FC000000FF000003FE000000FF000003FE000000FF000001FF000000FF0000
+00FF800000FF000000FFC00000FF000000FFE00001FF800001FFF000FFFFFF001FFFFF80
+FFFFFF001FFFFF80FFFFFF001FFFFF8039397DB841>202 D<FFFFFF003FFFFFC0FFFFFF
+003FFFFFC0FFFFFF003FFFFFC001FF8000007FE00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF00
+00003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF00
+00003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00000FFFFFFFFFFC00000FFFFFFFFFFC00000FFFF
+FFFFFFC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF00
+00003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF00
+00003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC0
+0000FF0000003FC00000FF0000003FC00001FF8000007FE000FFFFFF003FFFFFC0FFFFFF
+003FFFFFC0FFFFFF003FFFFFC03A397DB841>205 D<FFFFFFFFFFFFFFC0FFFFFFFFFFFF
+FFC0FFFFFFFFFFFFFFC001FF8000007FE00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003F
+C00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003F
+C00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003F
+C00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003F
+C00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003F
+C00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF0000003FC00000FF
+0000003FC00000FF0000003FC00001FF8000007FE000FFFFFF003FFFFFC0FFFFFF003FFF
+FFC0FFFFFF003FFFFFC03A397DB841>207 D<000001FF80018000000FFFE0038000007F
+FFF803800001FF807E07800003FC000F0F80000FF000039F80001FE00001DF80003F8000
+00FF80007F0000007F8000FE0000003F8001FE0000003F8003FC0000001F8007F8000000
+0F8007F80000000F800FF000000007800FF000000007801FE000000007801FE000000003
+803FE000000003803FC000000003807FC000000001807FC000000001807FC00000000180
+7F800000000180FF800000000000FF800000000000FF800000000000FF800000000000FF
+800000000000FF800000000000FF800000000000FF800000000000FF800000000000FF80
+0000000000FF800000000000FF800000000000FF8000000000007F8000000000007FC000
+000001807FC000000001807FC000000001803FC000000001803FE000000001801FE00000
+0003801FE000000003000FF000000003000FF0000000070007F8000000070007F8000000
+060003FC0000000E0001FE0000001C0000FE0000001800007F0000003800003F80000070
+00001FE00000E000000FF00003C0000003FC000F80000001FF803F000000007FFFFC0000
+00000FFFF00000000001FF800000313D7BBA3C>209 D<001FE0000000FFFC000003E03F
+000007000F80000F8007E0001FC003F0001FE003F0001FE001F8001FE001F8001FE000FC
+000FC000FC00078000FC00000000FC00000000FC00000000FC00000000FC0000007FFC00
+0007FFFC00003FE0FC0000FE00FC0003F800FC000FF000FC001FC000FC003FC000FC007F
+8000FC007F0000FC007F0000FC0CFE0000FC0CFE0000FC0CFE0000FC0CFE0001FC0CFE00
+01FC0CFF0003FC0C7F00077C0C7F80063E183FC01E3E180FE0781FF003FFF00FE0007F80
+07C026277DA52A>224 D<00000000C000000007C00000003FC0000007FFC000007FFF80
+0003FFFF00000FFFFC00003FFFF00000FFFE000001FFC0000003FC00000007F00000000F
+C00000000F800000001F000000001E000000003C000000003C0000000038000000007800
+0000007003FE0000700FFF8000703E03E00060F800F80061F0007C00E3E0003E00E7C000
+1F00EF80000F80DF80000FC0DF000007C0FF000007E0FF000007E0FE000003F0FE000003
+F0FE000003F0FE000003F0FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8
+FE000003F8FE000003F8FE000003F8FE000003F87E000003F07E000003F07F000007F03F
+000007E03F000007E01F80000FC00F80000F800FC0001F8007E0003F0003F0007E0000F8
+00F800007E03F000001FFFC0000003FE0000253B7EB92A>I<FFFFFF8000FFFFFFF00007
+F801FC0003F0007E0003F0003F0003F0001F8003F0001FC003F0001FC003F0001FC003F0
+001FC003F0001FC003F0003F8003F0003F0003F000FE0003F003F80003FFFFC00003FFFF
+C00003F000F80003F0003E0003F0001F0003F0000FC003F0000FE003F00007E003F00007
+F003F00007F003F00007F003F00007F003F00007F003F00007E003F0000FE003F0000FC0
+03F0001FC003F0007F8007F800FE00FFFFFFFC00FFFFFFE00024247EA32A>I<FFFFFFFE
+FFFFFFFE07F800FE03F0001E03F0000E03F0000E03F0000603F0000703F0000703F00003
+03F0000303F0000303F0000303F0000303F0000003F0000003F0000003F0000003F00000
+03F0000003F0000003F0000003F0000003F0000003F0000003F0000003F0000003F00000
+03F0000003F0000003F0000003F0000003F0000007FC0000FFFFF000FFFFF00020247EA3
+25>I<003FFFFFFFE0003FFFFFFFE00001E003FC000000C001F8000000C001F8000000C0
+01F8000000C001F8000000C001F8000000C001F8000000C001F8000000C001F8000000C0
+01F8000000C001F8000000C001F8000000C001F80000008001F80000018001F800000180
+01F80000018001F80000018001F80000018001F80000030001F80000030001F800000300
+01F80000060001F80000060001F80000060001F800000C0001F800001C0001F800001800
+01F80000300001F80000F00001F80001E00001F80007E00003FC007FFFFFFFFFF07FFFFF
+FFFFF07F00000007F07C00000001F0700000000070700000000070600000000030E00000
+000038E00000000038E00000000038C00000000018C00000000018C00000000018C00000
+000018C000000000182D3180A32E>I<0007F800001FFF00007C0FC001F803E003F001F0
+07E001F80FC000F81F80007C1F80007C3F00007E3F00003E7F00003E7F00003F7E00003F
+FE00003FFE00003FFE00003FFFFFFFFFFFFFFFFFFE000000FE000000FE000000FE000000
+FE0000007E0000007E0000007F0000007F0000003F0000033F8000031F8000070FC00006
+07C0000E07E0001C01F0003800F80070007E03E0001FFF800003FC0020277EA525>I<3F
+FF00FFFFC03FFF003FFF00FFFFC03FFF0007FE0007F8001FF80001FC0003F0000FE00000
+7C0003F0000F8000001E0003F0001E0000000F0003F0003C000000078003F00078000000
+01C003F000E000000000E003F001C0000000007003F00380000000003C03F00F00000000
+000E03F01C00000000000F03F03C00000000001F83F07E00000000003FE3F1FF00000000
+003FF3F3FF00000000007F3BF73F8000000000FE1FFE1FC000000001FC0FFC0FE0000000
+01FC03F00FE000000003F803F007F000000007F003F003F80000000FE003F001FC000000
+0FE003F001FC0000001FC003F000FE0000003F8003F0007F0000007F0003F0003F800000
+7E0003F0001F800000FE0003F0001FC00001FC0003F0000FE00003FC0003F0000FF00007
+FC0003F0000FF8000FFC0007F8000FFC00FFFF00FFFFC03FFFC0FFFF00FFFFC03FFFC042
+247FA345>I<C07FF000E3FFFF00FF803FC0FC000FE0F80003F0F00003F8E00001F8E000
+01FCC00001FCC00001FC000001FC000001FC000001F8000003F0000007E000000FC00000
+3F00007FF800007FFC0000003F8000000FE0000003F0000001F8000001FC000000FC0000
+00FE000000FE000000FEC00000FEC00000FEC00000FEC00000FCE00001FC600001F87000
+03F03C000FE00F003FC003FFFF0000FFF0001F277EA525>I<FFFFC1FFFF80FFFFC1FFFF
+8007F8000FF00003F00007E00003F00007E00003F00007E00003F00007E00003F0000FE0
+0003F0001FE00003F0003FE00003F00077E00003F000E7E00003F000C7E00003F001C7E0
+0003F00387E00003F00707E00003F00E07E00003F00C07E00003F01807E00003F03807E0
+0003F07007E00003F0E007E00003F1C007E00003F18007E00003F38007E00003F70007E0
+0003FE0007E00003FC0007E00003F80007E00003F00007E00003F00007E00003F00007E0
+0003F00007E00007F8000FF000FFFFC1FFFF80FFFFC1FFFF8029247EA32E>I<001E003C
+0000007F007F0000007F80FF000000FF80FF800000FF80FF800000FF80FF800000FF80FF
+8000007F007F0000003E003E0000001FFFFC00000007FFF000000000FF80000000000000
+0000000000000000000000000000000000000000FFFFC1FFFF80FFFFC1FFFF8007F8000F
+F00003F00007E00003F00007E00003F00007E00003F00007E00003F0000FE00003F0001F
+E00003F0003FE00003F00077E00003F000E7E00003F000C7E00003F001C7E00003F00387
+E00003F00707E00003F00E07E00003F00C07E00003F01807E00003F03807E00003F07007
+E00003F0E007E00003F1C007E00003F18007E00003F38007E00003F70007E00003FE0007
+E00003FC0007E00003F80007E00003F00007E00003F00007E00003F00007E00003F00007
+E00007F8000FF000FFFFC1FFFF80FFFFC1FFFF8029347EB32E>I<FFFFC03FFF00FFFFC0
+3FFF0007F8001FF80003F0000FE00003F0000F800003F0001E000003F0003C000003F000
+78000003F000E0000003F001C0000003F00380000003F00F00000003F01C00000003F03C
+00000003F07E00000003F1FF00000003F3FF00000003F73F80000003FE1FC0000003FC0F
+E0000003F00FE0000003F007F0000003F003F8000003F001FC000003F001FC000003F000
+FE000003F0007F000003F0003F800003F0001F800003F0001FC00003F0000FE00003F000
+0FF00003F0000FF80007F8000FFC00FFFFC03FFFC0FFFFC03FFFC02A247EA32E>I<00FF
+FFFFFFC000FFFFFFFFC00003C007F80000018003F00000018003F00000018003F0000001
+8003F00000018003F00000018003F00000018003F00000018003F00000018003F0000001
+8003F00000018003F00000018003F00000018003F00000018003F00000018003F0000003
+8003F00000030003F00000030003F00000030003F00000030003F00000030003F0000003
+0003F00000070003F00000060003F00038060003F0007C060003F000FE060003F000FE0E
+0003F000FE0C0003F000FE1C0003F000F8180007F800703800FFFFC03FF000FFFFC01FC0
+000000002A257FA32E>I<FFF000000FFFFFF800001FFF07F800001FE003F800001FC003
+7C000037C0037C000037C0033E000067C0033E000067C0033E000067C0031F0000C7C003
+1F0000C7C0030F800187C0030F800187C0030F800187C00307C00307C00307C00307C003
+03E00607C00303E00607C00303E00607C00301F00C07C00301F00C07C00300F81807C003
+00F81807C00300F81807C003007C3007C003007C3007C003003E6007C003003E6007C003
+003E6007C003001FC007C003001FC007C007800F8007C00FC00F8007C01FE00F800FE0FF
+FC0701FFFFFFFC0701FFFF30247DA337>I<FFFFC1FFFF80FFFFC1FFFF8007F8000FF000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03FFFFFFE00003FFFFFFE00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+07F8000FF000FFFFC1FFFF80FFFFC1FFFF8029247EA32E>I<0003FE0000000FFF800000
+3E03E00000F800F80001F0007C0003E0003E0007C0001F000F80000F801F80000FC01F00
+0007C03F000007E03F000007E07E000003F07E000003F07E000003F07E000003F0FE0000
+03F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003F8FE000003
+F8FE000003F87E000003F07E000003F07F000007F03F000007E03F000007E01F80000FC0
+0F80000F800FC0001F8007E0003F0003F0007E0000F800F800007E03F000001FFFC00000
+03FE000025277EA52A>I<FFFFFFFFFF80FFFFFFFFFF8007F8000FF00003F00007E00003
+F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003
+F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003
+F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003
+F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003
+F00007E00003F00007E00003F00007E00003F00007E00003F00007E00007F8000FF000FF
+FFC1FFFF80FFFFC1FFFF8029247EA32E>I<03F01FE000FFF07FF800FFF1E07E00FFF380
+1F8007F7000FC003FE0007E003FC0003F003F80003F803F00001F803F00001FC03F00000
+FC03F00000FE03F00000FE03F00000FE03F000007F03F000007F03F000007F03F000007F
+03F000007F03F000007F03F000007F03F000007F03F000007F03F000007F03F00000FE03
+F00000FE03F00000FE03F00001FC03F00001FC03F80003F803F80003F003FC0007F003FE
+000FE003F6000FC003F7803F0003F1E07E0003F0FFF80003F01FC00003F000000003F000
+000003F000000003F000000003F000000003F000000003F000000003F000000003F00000
+0003F000000003F000000007F8000000FFFFC00000FFFFC00000FFFFC0000028357EA42E
+>I<0003FC00001FFF80007E03E001F8007003F000F807E001FC0FC003FC0FC003FC1F80
+03FC3F8003FC3F0001F87F0000F07F0000007F0000007E000000FE000000FE000000FE00
+0000FE000000FE000000FE000000FE000000FE000000FE000000FE0000007E0000007F00
+00007F0000003F0000063F8000061F80000E1FC0000C0FC0001C07E0003803F0007001F8
+00E0007C07C0001FFF000007F8001F277DA525>I<7FFFFFFFE07FFFFFFFE07E03FC07E0
+7801F801E07001F800E06001F800606001F80060E001F80070E001F80070C001F80030C0
+01F80030C001F80030C001F80030C001F800300001F800000001F800000001F800000001
+F800000001F800000001F800000001F800000001F800000001F800000001F800000001F8
+00000001F800000001F800000001F800000001F800000001F800000001F800000001F800
+000001F800000007FE000003FFFFFC0003FFFFFC0024247EA329>I<FFFF803FFEFFFF80
+3FFE0FF8000FF807F00007E003F00003C003F000038001F800038001F800030001FC0003
+0000FC00060000FC000600007E000C00007E000C00007F000C00003F001800003F001800
+001F803000001F803000001FC07000000FC06000000FC060000007E0C0000007E0C00000
+07F1C0000003F180000003F180000001FB00000001FB00000001FF00000000FE00000000
+FE000000007C000000007C000000007C0000000038000000003800000000300000000030
+00000000700000000060000000006000000000C000000000C000007C01C00000FE018000
+00FE03800000FE03000000FE06000000FC0E000000701C00000038380000001FF0000000
+0FC000000027357EA32C>I<0000003F0000000000000FFF0000000000000FFF00000000
+00000FFF00000000000000FF000000000000003F000000000000003F000000000000003F
+000000000000003F000000000000003F000000000000003F000000000000003F00000000
+0000003F000000000000003F000000000000003F000000000000003F000000000000003F
+000000000000003F000000000000003F000000000000003F000000000000003F00000000
+0003F83F07F00000000FFE3F1FFC0000007F07BF783F800000FC01FFE00FC00001F800FF
+C007E00007F0007F8003F8000FE0007F8001FC000FC0003F0000FC001FC0003F0000FE00
+3F80003F00007F003F80003F00007F007F00003F00003F807F00003F00003F807F00003F
+00003F80FE00003F00001FC0FE00003F00001FC0FE00003F00001FC0FE00003F00001FC0
+FE00003F00001FC0FE00003F00001FC0FE00003F00001FC0FE00003F00001FC0FE00003F
+00001FC0FE00003F00001FC07F00003F00003F807F00003F00003F807F00003F00003F80
+3F80003F00007F003F80003F00007F001FC0003F0000FE000FC0003F0000FC000FE0007F
+8001FC0007F000FFC003F80001F800FFC007E00000FC01FFE00FC000007F07BF783F8000
+000FFE3F1FFC00000003F83F07F000000000003F000000000000003F000000000000003F
+000000000000003F000000000000003F000000000000003F000000000000003F00000000
+0000003F000000000000003F000000000000003F000000000000003F000000000000007F
+8000000000000FFFFC00000000000FFFFC00000000000FFFFC0000003A4A7DB941>I<FF
+FF807FFF00FFFF807FFF0007FF003FF00003FE001FC00001FC001F000000FE001E000000
+7E001C0000003F00180000001F80300000001FC0700000000FC0E000000007E0C0000000
+07F18000000003FB8000000001FF0000000000FE0000000000FE00000000007F00000000
+003F00000000007F80000000007FC000000000CFC000000001C7E00000000383F0000000
+0703F80000000601F80000000C00FC0000001C007E00000038007F00000078003F000000
+F0001F800001F0001FC00003F0001FE0001FF8003FF800FFFE00FFFF80FFFE00FFFF8029
+247FA32C>I<FFFFC1FFFF80FFFFC1FFFF8007F8000FF00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E000
+03F00007E00003F00007E00003F00007E00003F00007E00007F8000FF000FFFFFFFFFFC0
+FFFFFFFFFFC0000000001FC00000000007C00000000001C00000000001C00000000000C0
+0000000000E00000000000E00000000000E0000000000060000000000060000000000060
+0000000000600000000000602B317EA32E>I<FFFFC1FFFF80FFFFC1FFFF8007F8000FF0
+0003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E0
+0003F00007E00003F00007E00003F00007E00003F00007E00003F00007E00003F00007E0
+0001F80007E00000F8001FE000007E00FFE000003FFFE7E0000007FF07E00000000007E0
+0000000007E00000000007E00000000007E00000000007E00000000007E00000000007E0
+0000000007E00000000007E00000000007E00000000007E00000000007E00000000007E0
+000000000FF000000001FFFF80000001FFFF8029247EA32E>I<FFFFC3FFFF0FFFFCFFFF
+C3FFFF0FFFFC07F8001FE0007F8003F0000FC0003F0003F0000FC0003F0003F0000FC000
+3F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0
+000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC000
+3F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0
+000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC000
+3F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0
+000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC000
+3F0007F8001FE0007F80FFFFFFFFFFFFFFFCFFFFFFFFFFFFFFFC3E247EA343>I<FFFFC3
+FFFF0FFFFCFFFFC3FFFF0FFFFC07F8001FE0007F8003F0000FC0003F0003F0000FC0003F
+0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F000
+0FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F
+0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F000
+0FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F
+0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F000
+0FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F0003F0000FC0003F
+0003F0000FC0003F0007F8001FE0007F80FFFFFFFFFFFFFFFEFFFFFFFFFFFFFFFE000000
+00000000FE000000000000003E000000000000000E000000000000000E00000000000000
+060000000000000007000000000000000700000000000000070000000000000003000000
+000000000300000000000000030000000000000003000000000000000340317EA343>I<
+7FFFFF0000007FFFFF0000007E03FC0000007801F80000007001F80000006001F8000000
+6001F8000000E001F8000000E001F8000000C001F8000000C001F8000000C001F8000000
+C001F8000000C001F80000000001F80000000001FFFFE0000001FFFFFC000001F800FF00
+0001F8003F800001F8001FC00001F8000FE00001F80007F00001F80007F00001F80003F8
+0001F80003F80001F80003F80001F80003F80001F80003F80001F80007F00001F80007F0
+0001F8000FE00001F8001FC00001F8003F800003FC00FF00007FFFFFFC00007FFFFFE000
+2D247EA333>I<FFFFC00007FFFFFFFFC00007FFFF07F80000003FC003F00000001FC003
+F00000001F8003F00000001F8003F00000001F8003F00000001F8003F00000001F8003F0
+0000001F8003F00000001F8003F00000001F8003F00000001F8003F00000001F8003F000
+00001F8003FFFFC0001F8003FFFFF8001F8003F001FE001F8003F0007F001F8003F0003F
+801F8003F0001FC01F8003F0000FE01F8003F0000FE01F8003F00007F01F8003F00007F0
+1F8003F00007F01F8003F00007F01F8003F00007F01F8003F0000FE01F8003F0000FE01F
+8003F0001FC01F8003F0003F801F8003F0007F001FC007F801FE003FC0FFFFFFF807FFFF
+FFFFFFC007FFFF38247EA33C>I<FFFFC00000FFFFC0000007F800000003F000000003F0
+00000003F000000003F000000003F000000003F000000003F000000003F000000003F000
+000003F000000003F000000003F000000003FFFFC00003FFFFF80003F001FE0003F0007F
+0003F0003F8003F0001FC003F0000FE003F0000FE003F00007F003F00007F003F00007F0
+03F00007F003F00007F003F0000FE003F0000FE003F0001FC003F0003F8003F0007F0007
+F801FE00FFFFFFF800FFFFFFC00024247EA32A>I<003F8000C1FFF000E7C0FC00FE003F
+00FC001F80F8000FC0F00007E0E00007E0E00003F0C00003F8000001F8000001FC000001
+FC000001FC000000FC000000FE03FE00FE0FFF80FE0FFFFFFE003FFFFE000FFCFE0003C0
+FE000000FE000000FE000000FE000000FC000001FC000001FCC00001F8C00003F8E00003
+F0600007F0700007E038000FC01C001F800E003F0007C07C0001FFF000003FC0001F277E
+A525>I<000000001FE0000000000000FFFC0000FFFFC003F03F0000FFFFC007C00F8000
+07F8000F0003C00003F0001E0001E00003F0003E0001F00003F0007C0000F80003F000FC
+0000FC0003F000F800007C0003F001F800007E0003F001F800007E0003F003F000003F00
+03F003F000003F0003F003F000003F0003F007F000003F8003F007F000003F8003FFFFF0
+00003F8003FFFFF000003F8003F007F000003F8003F007F000003F8003F007F000003F80
+03F007F000003F8003F007F000003F8003F007F000003F8003F003F000003F0003F003F0
+00003F0003F003F800007F0003F001F800007E0003F001F800007E0003F000FC0000FC00
+03F0007C0000F80003F0007E0001F80003F0003E0001F00003F0001F0003E00007F80007
+C00F8000FFFFC003F03F0000FFFFC000FFFC0000000000001FE0000039277EA53E>I<00
+01FFFFFF80001FFFFFFF80007F000FF00000FC0007E00001F80007E00003F00007E00007
+F00007E00007F00007E00007F00007E00007F00007E00007F00007E00003F00007E00003
+F80007E00001F80007E00000FE0007E000003F8007E000000FFFFFE0000000FFFFE00000
+00FE07E0000000FC07E0000001F807E0000003F007E0000007F007E0000007E007E00000
+0FC007E000001F8007E000003F8007E000007F0007E000007E0007E00000FE0007E00001
+FC0007E00003F80007E00007F80007E0001FF8000FF000FFFF01FFFF80FFFF01FFFF8029
+247FA32D>I E
+%EndDVIPSBitmapFont
+end
 %%EndProlog
 %%BeginSetup
 %%Feature: *Resolution 600dpi
@@ -5105,90 +3163,90 @@ TeXDict begin 1 0 bop 1258 -45 a Fi
 (\342\345\360\361\350\350)e(22\))-128 330 y Fh(1)132
 b(\307\340\357\363)l(\361\352)45 b(Emacs)-128 511 y Fi(\304\353\377)28
 b(\347\340\357\363)n(\361\352)n(\340)e(GNU)i(Emacs)f(22,)g
-(\357\360\356\361\362\356)f(\355\340\341\345\360\350\362\345)h
-(\350\354\377)h(\357\360\356\343\360\340\354\354\373:)f
+(\357\360\356\361\362\356)g(\355\340\341\345\360\350\362\345)h
+(\350\354\377)g(\357\360\356\343\360\340\354\354\373:)f
 Fg(emacs)-128 786 y Fh(2)132 b(\302\373\365)l(\356)l(\344)45
 b(\350\347)f(Emacs)-78 966 y Fi(\317\360\350\356\361\362)n
-(\340\355\356\342\350\362\374)24 b(\360\340\341\356\362\363)i(Emacs)h
-(\(\350\353\350)h(\361\342\345\360\355\363\362\374)e(\342)h(\350\352)n
-(\356\355\352\363)h(\357\360\350)g(\360\340\341\356\362\345)d(\342)i
-(X\))255 b Fg(C-z)-78 1065 y Fi(\302\373\351\362\350)27
-b(\350\347)h(Emacs)2307 b Fg(C-x)42 b(C-c)-128 1310 y
+(\340\355\356\342\350\362\374)26 b(\360\340\341\356\362\363)h(Emacs)g
+(\(\350\353\350)h(\361\342\345\360\355\363\362\374)f(\342)g(\350\352)n
+(\356\355\352\363)h(\357\360\350)g(\360\340\341\356\362\345)e(\342)h
+(X\))255 b Fg(C-z)-78 1065 y Fi(\302\373\351\362\350)28
+b(\350\347)g(Emacs)2307 b Fg(C-x)42 b(C-c)-128 1310 y
 Fh(3)132 b(\324\340\351\353\373)-78 1471 y Ff
 (\356\362\352\360\373\362\374)28 b Fi(\364\340\351\353)f(\342)g(Emacs)
 2014 b Fg(C-x)42 b(C-f)-78 1570 y Ff(\361\356)m
 (\365\360\340\355\350\362\374)29 b Fi(\364\340\351\353)e
-(\356\341\360\340\362\355\356)f(\355\340)h(\344\350\361\352)1627
+(\356\341\360\340\362\355\356)g(\355\340)g(\344\350\361\352)1627
 b Fg(C-x)42 b(C-s)-78 1670 y Fi(\361\356)n
-(\365\360\340\355\350\362\374)26 b Ff(\342\361\345)h
+(\365\360\340\355\350\362\374)27 b Ff(\342\361\345)g
 Fi(\364\340\351\353\373)2104 b Fg(C-x)42 b(s)-78 1770
 y Ff(\342\361\362)m(\340\342\350\362\374)29 b Fi(\361\356)n
 (\344\345\360)n(\346\350\354\356\345)d(\344\360\363\343\356\343\356)h
-(\364\340\351\353\340)f(\342)h(\362\345\352\363\371\350\351)g
+(\364\340\351\353\340)f(\342)h(\362\345\352\363\371\350\351)h
 (\341\363\364\345\360)809 b Fg(C-x)42 b(i)-78 1869 y
-Fi(\356\362\352\360\373\362\374)26 b(\355\363\346\355\373\351)i
-(\342\340\354)f(\364\340\351\353)g(\342\354\345\361\362\356)f
-(\362\345\352\363\371\345\343\356)1225 b Fg(C-x)42 b(C-v)-78
-1969 y Fi(\361\356)n(\365\360\340\355\350\362\374)26
-b(\341\363\364\345\360)g(\342)h(\363\352)n
+Fi(\356\362\352\360\373\362\374)28 b(\355\363\346\355\373\351)g
+(\342\340\354)f(\364\340\351\353)g(\342\354\345\361\362\356)g
+(\362\345\352\363\371\345\343\356)1226 b Fg(C-x)42 b(C-v)-78
+1969 y Fi(\361\356)n(\365\360\340\355\350\362\374)27
+b(\341\363\364\345\360)f(\342)h(\363\352)n
 (\340\347\340\355\355\356\354)g(\364\340\351\353\345)1534
 b Fg(C-x)42 b(C-w)-78 2068 y Fi
-(\317\345\360\345\352\353\376\367\350\362\374)27 b
-(\361\356\361\362\356)n(\377\355\350\345)f(\341\363\364\345\360\340)g
-(\020\362\356\353\374\352)n(\356)f(\344\353\377)j
-(\367\362\345\355\350\377\021)927 b Fg(C-x)42 b(C-q)-128
+(\317\345\360\345\352\353\376\367\350\362\374)28 b
+(\361\356\361\362\356)n(\377\355\350\345)f(\341\363\364\345\360\340)f
+(\020\362\356\353\374\352)n(\356)g(\344\353\377)i
+(\367\362\345\355\350\377\021)928 b Fg(C-x)42 b(C-q)-128
 2314 y Fh(4)132 b(\317\356\353\363\367\345\355\350\345)43
 b(\357\356\354\356\371\350)-128 2496 y Fi
 (\321\357\360\340\342\356\367\355\340\377)19 b
-(\361\350\361\362\345\354\340)h(\344\356\361\362)n
-(\340\362\356\367\355\356)d(\357\360\356\361\362)n(\340.)i
-(H\340\346\354\350\362\345)i Fg(C-h)e Fi(\(\350\353\350)i
-Fg(F1)p Fi(\))f(\350)h(\361\353\345\344\363\351\362\345)f
-(\350\355\361\362\360\363\352\366\350\377\354.)g(\305\361\353\350)i
+(\361\350\361\362\345\354\340)i(\344\356\361\362)n
+(\340\362\356\367\355\356)e(\357\360\356\361\362)n(\340.)h
+(H\340\346\354\350\362\345)i Fg(C-h)d Fi(\(\350\353\350)i
+Fg(F1)p Fi(\))f(\350)h(\361\353\345\344\363\351\362\345)g
+(\350\355\361\362\360\363\352\366\350\377\354.)g(\305\361\353\350)h
 (\342\373)d(\342)i(\357\345\360\342\373\351)-128 2595
-y(\360\340\347)28 b(\360\340\341\356\362)n(\340\345\362\345)c(\361)j
-(Emacs,)h(\362\356)f(\355\340\341\345\360\350\362\345)f
+y(\360\340\347)28 b(\360\340\341\356\362)n(\340\345\362\345)e(\361)h
+(Emacs,)h(\362\356)g(\355\340\341\345\360\350\362\345)f
 Fg(C-u)42 b(C-h)g(t)i(Russian)c(RET)27 b Fi(\344\353\377)h
 (\342\373\347\356\342\340)d Ff(\363\367\345\341\355\350\352)m(\340)p
-Fi(.)-78 2689 y(\321\352\360\373\362\374)i(\356\352\355\356)g
+Fi(.)-78 2689 y(\321\352\360\373\362\374)j(\356\352\355\356)f
 (\361\357\360\340\342\352\350)2104 b Fg(C-x)42 b(1)-78
-2789 y Fi(\317\360\356\352\360\363\362\350\362\374)26
-b(\356\352\355\356)h(\361\357\360\340\342\352\350)1940
+2789 y Fi(\317\360\356\352\360\363\362\350\362\374)28
+b(\356\352\355\356)f(\361\357\360\340\342\352\350)1940
 b Fg(C-M-v)-78 2889 y Fi(aprop)r(os:)26 b(\357\356\352)n
-(\340\347\340\362\374)f(\352)n(\356\354\340\355\344\373,)i
-(\361\356\356\362\342\345\362\361\362\342\363\376\371\350\345)d
-(\361\362\360\356\352)n(\345)920 b Fg(C-h)42 b(a)-78
-2988 y Fi(\357\356\352)n(\340\347\340\362\374)25 b(\350\354\377)j
-(\364\363\355\352\366\350\350,)g(\352)n(\356\362\356\360\340\377)e
+(\340\347\340\362\374)g(\352)n(\356\354\340\355\344\373,)h
+(\361\356\356\362\342\345\362\361\362\342\363\376\371\350\345)g
+(\361\362\360\356\352)n(\345)921 b Fg(C-h)42 b(a)-78
+2988 y Fi(\357\356\352)n(\340\347\340\362\374)26 b(\350\354\377)i
+(\364\363\355\352\366\350\350,)g(\352)n(\356\362\356\360\340\377)f
 (\347\340\357\363)n(\361\352)n(\340\345\362\361)n(\377)e
 (\352\353\340\342\350\370\345\351)835 b Fg(C-h)42 b(k)-78
-3088 y Fi(\357\356\353\363\367\350\362\374)27 b
-(\350\355\364\356\360\354\340\366\350\376)g(\356)g
+3088 y Fi(\357\356\353\363\367\350\362\374)28 b
+(\350\355\364\356\360\354\340\366\350\376)f(\356)g
 (\364\363\355\352\366\350\350)1623 b Fg(C-h)42 b(f)-78
-3187 y Fi(\357\356\353\363\367\350\362\374)27 b
-(\350\355\364\356\360\354\340\366\350\376)g(\356)g
+3187 y Fi(\357\356\353\363\367\350\362\374)28 b
+(\350\355\364\356\360\354\340\366\350\376)f(\356)g
 (\360\345\346\350\354\345)1672 b Fg(C-h)42 b(m)-128 3434
 y Fh(5)132 b(\310\361\357\360\340\342\353\345\355\350\345)43
 b(\356\370\350\341\356\352)-78 3617 y Ff
 (\357\360\345\360\342\340\362\374)28 b Fi
-(\367\340\361\362\350\367\355\356)e
-(\355\340\341\360\340\355\355\363\376)h(\350\353\350)h
+(\367\340\361\362\350\367\355\356)f
+(\355\340\341\360\340\355\355\363\376)g(\350\353\350)h
 (\350\361\357\356\353\355\377\345\354\363\376)g(\352)n
 (\356\354\340\355\344\363)682 b Fg(C-g)-78 3717 y Ff
 (\342\356\361\361\362)m(\340\355\356\342\350\362\374)29
-b Fi(\364\340\351\353,)e(\357\356\362\345\360)n(\377\355\355\373\351)f
-(\357\360\350)i(\352\360\340\365)n(\345)f(\361\350\361\362\345\354\373)
-894 b Fg(M-x)2857 3816 y(recover-file)-78 3916 y Ff
+b Fi(\364\340\351\353,)e(\357\356\362\345\360)n(\377\355\355\373\351)g
+(\357\360\350)h(\352\360\340\365)n(\345)f(\361\350\361\362\345\354\373)
+895 b Fg(M-x)2857 3816 y(recover-file)-78 3916 y Ff
 (\356\362\354\345\355\350\362\374)27 b Fi(\355\345\346)n
-(\345\353\340\362\345\353\374\355\373\345)f
+(\345\353\340\362\345\353\374\355\373\345)g
 (\350\347\354\345\355\345\355\350\377)1502 b Fg(C-x)42
 b(u,)h(C-_)2857 4016 y Fi(\350\353\350)g Fg(C-/)-78 4115
-y Fi(\342\356\361\361\362)n(\340\355\356\342\350\362\374)24
-b(\341\363\364\345\360)i(\342)h(\357\345\360\342\356\355\340)n
+y Fi(\342\356\361\361\362)n(\340\355\356\342\350\362\374)26
+b(\341\363\364\345\360)g(\342)h(\357\345\360\342\356\355\340)n
 (\367\340\353\374\355\356\345)e(\361\356\361\362\356)n
-(\377\355\350\345)1085 b Fg(M-x)2857 4215 y(revert-buffer)-78
-4315 y Fi(\357\345\360\345\360\350\361\356\342\340\362\374)26
-b(\347\340\357\356\353\355\345\355\355\373\351)h(\354\363)n
+(\377\355\350\345)1086 b Fg(M-x)2857 4215 y(revert-buffer)-78
+4315 y Fi(\357\345\360\345\360\350\361\356\342\340\362\374)27
+b(\347\340\357\356\353\355\345\355\355\373\351)g(\354\363)n
 (\361\356\360\356\354)f(\375\352\360\340\355)1321 b Fg(C-l)-128
 4560 y Fh(6)132 b(H\340\360\340\371\350\342\340\345\354\373\351)41
 b(\357\356\350\361\352)-78 4743 y Fi(\357\356\350\361\352)28
@@ -5200,46 +3258,46 @@ b(\342\373\360\340\346)n(\345\355\350\376)f(\342\357\345\360\345\344)
 1335 b Fg(C-M-s)-78 5042 y Fi(\357\356\350\361\352)28
 b(\357\356)f(\360\345\343\363)-5 b(\353\377\360\355\356\354\363)28
 b(\342\373\360\340\346)n(\345\355\350\376)f(\355\340\347\340\344)1376
-b Fg(C-M-r)-78 5142 y Fi(\342\373\341\360\340\362\374)25
-b(\357\360\345\344\373\344\363\371\363\376)j(\361\362\360\356\352\363)f
+b Fg(C-M-r)-78 5142 y Fi(\342\373\341\360\340\362\374)26
+b(\357\360\345\344\373\344\363\371\363\376)i(\361\362\360\356\352\363)g
 (\357\356\350\361\352)n(\340)1527 b Fg(M-p)-78 5241 y
-Fi(\342\373\341\360\340\362\374)25 b
-(\361\353\345\344\363\376\371\363\376)j(\361\362\360\356\352\363)f
+Fi(\342\373\341\360\340\362\374)26 b
+(\361\353\345\344\363\376\371\363\376)i(\361\362\360\356\352\363)g
 (\357\356\350\361\352)n(\340)1580 b Fg(M-n)-78 5341 y
-Fi(\357\360\345\352\360\340\362\350\362\374)26 b
-(\355\340\360\340\371\350\342\340\345\354\373\351)h
+Fi(\357\360\345\352\360\340\362\350\362\374)28 b
+(\355\340\360\340\371\350\342\340\345\354\373\351)f
 (\357\356\350\361\352)1659 b Fg(RET)-78 5441 y Fi
-(\356\362\354\345\355\350\362\374)26 b(\375\364\364\345\352\362)h
-(\342\342\356)n(\344\340)e(\357\356\361\353\345\344\355\345\343\356)i
+(\356\362\354\345\355\350\362\374)28 b(\375\364\364\345\352\362)g
+(\342\342\356)n(\344\340)d(\357\356\361\353\345\344\355\345\343\356)i
 (\361\350\354\342\356\353\340)1248 b Fg(DEL)-78 5540
-y Fi(\357\360\345\360\342\340\362\374)26 b
+y Fi(\357\360\345\360\342\340\362\374)27 b
 (\362\345\352\363\371\350\351)h(\357\356\350\361\352)1994
 b Fg(C-g)-128 5636 y Fi(\304\353\377)26 b(\357\356\342\362\356\360\340)
-e(\357\356\350\361\352)n(\340)g(\342)i(\353\376\341\356\354)f
+f(\357\356\350\361\352)n(\340)f(\342)i(\353\376\341\356\354)f
 (\355\340\357\360\340\342\353\345\355\350\350)h
-(\350\361\357\356\353\374\347\363\351\362\345)e
-(\352\353\340\342\350\370\350)h Fg(C-s)g Fi(\350\353\350)h
+(\350\361\357\356\353\374\347\363\351\362\345)f
+(\352\353\340\342\350\370\350)g Fg(C-s)g Fi(\350\353\350)h
 Fg(C-r)p Fi(.)f(\305\361\353\350)h(Emacs)g(\342\361\345)f(\345\371\345)
-h(\357\360\356\350\347-)-128 5736 y(\342\356)n(\344\350\362)h
-(\357\356\350\361\352,)g Fg(C-g)f Fi(\356\362\354\345\355\350\362)h
-(\362\356\353\374\352)n(\356)f(\355\345)h
+h(\357\360\356\350\347-)-128 5736 y(\342\356)n(\344\350\362)i
+(\357\356\350\361\352,)f Fg(C-g)f Fi(\356\362\354\345\355\350\362)j
+(\362\356\353\374\352)n(\356)e(\355\345)g
 (\342\373\357\356\353\355\345\355\355\363\376)g(\367\340\361\362\374.)
 1860 6192 y(1)p eop end
 %%Page: 2 2
 TeXDict begin 2 1 bop -128 -45 a Fh(7)132 b
 (\317\345\360\345\354\345\371\345\355\350\345)-78 139
 y Ff(\345\344\350\355\350\366\373)32 b
-(\357\345\360\345\354\345\371\345\355\350\377)1945 b
+(\357\345\360\345\354\345\371\345\355\350\377)1944 b
 (\355\340\347\340\344)450 b(\342\357\345\360\345\344)-78
 239 y Fi(\361\350\354\342\356\353)2667 b Fg(C-b)558 b(C-f)-78
 338 y Fi(\361\353\356\342\356)2726 b Fg(M-b)558 b(M-f)-78
-438 y Fi(\361\362\360\356\352)n(\340)2682 b Fg(C-p)558
+438 y Fi(\361\362\360\356\352)n(\340)2683 b Fg(C-p)558
 b(C-n)-78 537 y Fi(\355\340)n(\367\340\353\356)26 b(\(\350\353\350)j
-(\352)n(\356\355\345\366\))e(\361\362\360\356\352\350)1915
+(\352)n(\356\355\345\366\))e(\361\362\360\356\352\350)1916
 b Fg(C-a)558 b(C-e)-78 637 y Fi(\357\360\345\344\353\356)n(\346)n
 (\345\355\350\345)2441 b Fg(M-a)558 b(M-e)-78 737 y Fi
 (\340\341\347\340\366)2726 b Fg(M-{)558 b(M-})-78 836
-y Fi(\361\362\360\340\355\350\366\340)2588 b Fg(C-x)42
+y Fi(\361\362\360\340\355\350\366\340)2589 b Fg(C-x)42
 b([)472 b(C-x)42 b(])-78 936 y Fi(\342\373\360\340\346)n
 (\345\355\350\345)27 b(\(sexp\))2261 b Fg(C-M-b)470 b(C-M-f)-78
 1036 y Fi(\364\363\355\352\366\350\377)2597 b Fg(C-M-a)470
@@ -5247,106 +3305,106 @@ b(C-M-e)-78 1135 y Fi(\357\345\360\345\365)n(\356)n(\344)27
 b(\342)g(\355\340)n(\367\340\353\356)f(\(\350\353\350)i(\352)n
 (\356\355\345\366\))g(\341\363\364\345\360\340)1508 b
 Fg(M-<)558 b(M->)-78 1243 y Fi(\357\360\356\352\360\363\362\352)n(\340)
-26 b(\375\352\360\340\355\340)h(\342\355\350\347)2054
-b Fg(C-v)-78 1343 y Fi(\357\360\356\352\360\363\362\352)n(\340)26
-b(\375\352\360\340\355\340)h(\342\342\345\360)n(\365)2016
-b Fg(M-v)-78 1442 y Fi(\357\360\356\352\360\363\362\352)n(\340)26
+27 b(\375\352\360\340\355\340)g(\342\355\350\347)2054
+b Fg(C-v)-78 1343 y Fi(\357\360\356\352\360\363\362\352)n(\340)27
+b(\375\352\360\340\355\340)g(\342\342\345\360)n(\365)2016
+b Fg(M-v)-78 1442 y Fi(\357\360\356\352\360\363\362\352)n(\340)27
 b(\342\353\345\342\356)2302 b Fg(C-x)42 b(<)-78 1542
-y Fi(\357\360\356\352\360\363\362\352)n(\340)26 b
+y Fi(\357\360\356\352\360\363\362\352)n(\340)27 b
 (\342\357\360\340\342\356)2251 b Fg(C-x)42 b(>)-78 1642
-y Fi(\363)n(\361\362)n(\340\355\356\342\352)n(\340)24
-b(\362\345\352\363\371\345\351)j(\361\362\360\356\352\350)g(\342)g
-(\366\345\355\362\360)h(\375\352\360\340\355\340)1329
+y Fi(\363)n(\361\362)n(\340\355\356\342\352)n(\340)25
+b(\362\345\352\363\371\345\351)j(\361\362\360\356\352\350)g(\342)f
+(\366\345\355\362\360)i(\375\352\360\340\355\340)1329
 b Fg(C-u)42 b(C-l)-128 1887 y Fh(8)132 b(\323\355\350\367\362\356)l
 (\346)l(\345\355\350\345)44 b(\350)g(\363)-7 b
 (\344\340\353\345\355\350\345)-78 2070 y Ff(\363\355\350\367\362\356)m
-(\346)m(\340\345\354\373\351)32 b(\356\341\372\345\352\362)1956
+(\346)m(\340\345\354\373\351)33 b(\356\341\372\345\352\362)1956
 b(\355\340\347\340\344)450 b(\342\357\345\360\345\344)-78
 2170 y Fi(\361\350\354\342\356\353)27 b(\(\363)-5 b
 (\344\340\353\345\355\350\345,)28 b(\340)f(\355\345)h
-(\363\355\350\367\362\356)n(\346)n(\345\355\350\345\))1509
+(\363\355\350\367\362\356)n(\346)n(\345\355\350\345\))1510
 b Fg(DEL)558 b(C-d)-78 2270 y Fi(\361\353\356\342\356)2726
-b Fg(M-DEL)470 b(M-d)-78 2369 y Fi(\361\362\360\356\352)n(\340)26
-b(\(\344\356)i(\352)n(\356\355\366\340)e(\361\362\360\356\352\350\))
-1971 b Fg(M-0)42 b(C-k)384 b(C-k)-78 2469 y Fi
+b Fg(M-DEL)470 b(M-d)-78 2369 y Fi(\361\362\360\356\352)n(\340)27
+b(\(\344\356)h(\352)n(\356\355\366\340)e(\361\362\360\356\352\350\))
+1972 b Fg(M-0)42 b(C-k)384 b(C-k)-78 2469 y Fi
 (\357\360\345\344\353\356)n(\346)n(\345\355\350\345)2441
 b Fg(C-x)42 b(DEL)384 b(M-k)-78 2569 y Fi(\342\373\360\340\346)n
 (\345\355\350\345)2512 b Fg(M\025)42 b(C-M-k)340 b(C-M-k)-78
-2676 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)26
+2676 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)28
 b Ff(\356\341\353\340\361\362\374)2116 b Fg(C-w)-78 2776
-y Fi(\361\352)n(\356\357\350\360\356\342\340\362\374)25
-b(\356\341\353\340\361\362\374)g(\342)i(\361\357\350\361\356\352)h
-(\363\355\350\367\362\356)n(\346)n(\345\355\350\351)1264
-b Fg(M-w)-78 2876 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)26
-b(\344\356)h(\361\353\345\344\363\376\371\345\343\356)g(\342\365)n
+y Fi(\361\352)n(\356\357\350\360\356\342\340\362\374)26
+b(\356\341\353\340\361\362\374)g(\342)h(\361\357\350\361\356\352)h
+(\363\355\350\367\362\356)n(\346)n(\345\355\350\351)1265
+b Fg(M-w)-78 2876 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)28
+b(\344\356)f(\361\353\345\344\363\376\371\345\343\356)g(\342\365)n
 (\356)n(\346\344\345\355\350\377)f(\361\350\354\342\356\353\340)h
 Fe(char)916 b Fg(M-z)42 b Fe(char)-78 2975 y Fi(\342\361\362)n
-(\340\342\350\362\374)25 b(\357\356\361\353\345\344\355\350\351)i
-(\363\355\350\367\362\356)n(\346)n(\345\355\355\373\351)g
-(\356\341\372\345\352\362)1305 b Fg(C-y)-78 3075 y Fi
-(\347\340\354\345\355\350\362\374)23 b(\362\356\353\374\352)n(\356)e
+(\340\342\350\362\374)27 b(\357\356\361\353\345\344\355\350\351)g
+(\363\355\350\367\362\356)n(\346)n(\345\355\355\373\351)h
+(\356\341\372\345\352\362)1306 b Fg(C-y)-78 3075 y Fi
+(\347\340\354\345\355\350\362\374)24 b(\362\356\353\374\352)n(\356)e
 (\367\362\356)i(\342\356\361\361\362)n
-(\340\355\356\342\353\345\355\355\373\351)d(\362\345\352)n(\361\362)j
-(\357\360\345\344\370\345\361\362\342\363\376\371\350\354)g
+(\340\355\356\342\353\345\355\355\373\351)d(\362\345\352)n(\361\362)k
+(\357\360\345\344\370\345\361\362\342\363\376\371\350\354)f
 (\363\355\350\367\362\356)n(\346)n(\345\355-)-78 3175
-y(\355\373\354)28 b(\362\345\352)n(\361\362\356\354)2857
+y(\355\373\354)k(\362\345\352)n(\361\362\356\354)2857
 3075 y(M-y)-128 3420 y Fh(9)132 b(\317\356\354\345\362\352)l(\340)-78
-3580 y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)24
-b(\357\356\354\345\362\352\350)2176 b Fg(C-@)42 b Fi(\350\353\350)i
-Fg(C-SPC)-78 3680 y Fi(\357\356\354\345\355\377\362\374)27
-b(\354\345\361\362)n(\340\354\350)g(\352\363\360\361\356\360)g(\350)h
-(\357\356\354\345\362\352\363)1540 b Fg(C-x)42 b(C-x)-78
-3779 y Fi(\357\356\354\345\362\350\362\374)26 b Fe(ar)l(g)36
+3580 y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)26
+b(\357\356\354\345\362\352\350)2177 b Fg(C-@)42 b Fi(\350\353\350)i
+Fg(C-SPC)-78 3680 y Fi(\357\356\354\345\355\377\362\374)28
+b(\354\345\361\362)n(\340\354\350)g(\352\363\360\361\356\360)f(\350)h
+(\357\356\354\345\362\352\363)1541 b Fg(C-x)42 b(C-x)-78
+3779 y Fi(\357\356\354\345\362\350\362\374)28 b Fe(ar)l(g)36
 b Ff(\361\353\356\342)2219 b Fg(M-@)-78 3879 y Fi
-(\357\356\354\345\362\350\362\374)26 b Ff
-(\357\340\360\340\343\360\340\364)2145 b Fg(M-h)-78 3979
-y Fi(\357\356\354\345\362\350\362\374)26 b Ff
+(\357\356\354\345\362\350\362\374)28 b Ff
+(\357\340\360\340\343\360\340\364)2144 b Fg(M-h)-78 3979
+y Fi(\357\356\354\345\362\350\362\374)28 b Ff
 (\361\362\360\340\355\350\366\363)2162 b Fg(C-x)42 b(C-p)-78
-4078 y Fi(\357\356\354\345\362\350\362\374)26 b Ff
-(\342\373\360\340\346)m(\345\355\350\345)2070 b Fg(C-M-@)-78
-4178 y Fi(\357\356\354\345\362\350\362\374)26 b Ff
-(\364\363\355\352\366\350\376)2149 b Fg(C-M-h)-78 4277
-y Fi(\357\356\354\345\362\350\362\374)26 b(\342\345\361\374)h
-Ff(\341\363\364\345\360)2103 b Fg(C-x)42 b(h)-128 4523
+4078 y Fi(\357\356\354\345\362\350\362\374)28 b Ff
+(\342\373\360\340\346)m(\345\355\350\345)2071 b Fg(C-M-@)-78
+4178 y Fi(\357\356\354\345\362\350\362\374)28 b Ff
+(\364\363\355\352\366\350\376)2148 b Fg(C-M-h)-78 4277
+y Fi(\357\356\354\345\362\350\362\374)28 b(\342\345\361\374)f
+Ff(\341\363\364\345\360)2102 b Fg(C-x)42 b(h)-128 4523
 y Fh(10)131 b(\307\340\354\345\355\340)44 b(\361)g
 (\347\340\357\360\356\361\356\354)-78 4706 y Fi
-(\350\355\362\345\360\340\352\362\350\342\355\340\377)26
-b(\347\340\354\345\355\340)h(\362\345\352)n(\361\362\356\342\356\351)e
-(\361\362\360\356\352\350)1397 b Fg(M-\045)-78 4806 y
+(\350\355\362\345\360\340\352\362\350\342\355\340\377)28
+b(\347\340\354\345\355\340)f(\362\345\352)n(\361\362\356\342\356\351)g
+(\361\362\360\356\352\350)1398 b Fg(M-\045)-78 4806 y
 Fi(\361)28 b(\350\361\357\356\353\374\347\356\342\340\355\350\345\354)e
 (\360\345\343\363)-5 b(\353\377\360\355\373\365)27 b
 (\342\373\360\340\346)n(\345\355\350\351)1333 b Fg(M-x)42
 b(query-replace-r)o(ege)o(xp)-128 4901 y Fi(\302)28 b
 (\360\345\346\350\354\345)g
-(\350\355\362\345\360\340\352\362\350\342\355\356\351)e
-(\347\340\354\345\355\373)h
-(\357\356\353\374\347\356\342\340\362\345\353\376)e
+(\350\355\362\345\360\340\352\362\350\342\355\356\351)g
+(\347\340\354\345\355\373)f
+(\357\356\353\374\347\356\342\340\362\345\353\376)f
 (\344\356\361\362\363\357\355\373)i
-(\361\353\345\344\363\376\371\350\345)h(\352)n
+(\361\353\345\344\363\376\371\350\345)g(\352)n
 (\356\354\340\355\344\373:)-78 4995 y Ff
 (\347\340\354\345\355\350\362\374)g Fi(\344\340\355\355\356\345)f
-(\361\356\356\362\342\345\362\361\362\342\350\345,)d
-(\357\345\360\345\351\362\350)j(\352)h
+(\361\356\356\362\342\345\362\361\362\342\350\345,)g
+(\357\345\360\345\351\362\350)h(\352)g
 (\361\353\345\344\363\376\371\345\354\363)815 b Fg(SPC)-78
-5095 y Fi(\347\340\354\345\355\350\362\374)27 b(\375\362\356)f
-(\361\356\356\362\342\345\362\361\362\342\350\345,)e(\355\345)k
-(\357\345\360\345\354\345\371\340\362\374\361)n(\377)1237
+5095 y Fi(\347\340\354\345\355\350\362\374)28 b(\375\362\356)f
+(\361\356\356\362\342\345\362\361\362\342\350\345,)g(\355\345)h
+(\357\345\360\345\354\345\371\340\362\374\361)n(\377)1238
 b Fg(,)-78 5194 y Ff(\357\360\356\357\363)m(\361\362\350\362\374)29
-b Fi(\361\356\356\362\342\345\362\361\362\342\350\345)24
-b(\341\345\347)j(\347\340\354\345\355\373)1487 b Fg(DEL)-78
-5294 y Fi(\347\340\354\345\355\350\362\374)27 b(\342\361\345)g
-(\356\361\362)n(\340\342\370\350\345\361)n(\377)d
-(\361\356\356\362\342\345\362\361\362\342\350\377)1465
+b Fi(\361\356\356\362\342\345\362\361\362\342\350\345)e(\341\345\347)g
+(\347\340\354\345\355\373)1487 b Fg(DEL)-78 5294 y Fi
+(\347\340\354\345\355\350\362\374)28 b(\342\361\345)f(\356\361\362)n
+(\340\342\370\350\345\361)n(\377)e
+(\361\356\356\362\342\345\362\361\362\342\350\377)1468
 b Fg(!)-78 5393 y Ff(\342\345\360\355\363\362\374\361)m(\377)29
 b Fi(\352)f(\357\360\345\344\373\344\363\371\345\354\363)f
-(\361\356\356\362\342\345\362\361\362\342\350\376)1334
+(\361\356\356\362\342\345\362\361\362\342\350\376)1337
 b Fg(\002)-78 5493 y Ff(\342\373\351\362\350)28 b Fi(\350\347)g
 (\360\345\346\350\354\340)f(\020\347\340\354\345\355\340)g(\361)g
 (\347\340\357\360\356\361\356\354\021)1453 b Fg(RET)-78
-5593 y Fi(\342\356\351\362\350)37 b(\342)h(\360\345\346\350\354)h
+5593 y Fi(\342\356\351\362\350)38 b(\342)g(\360\345\346\350\354)h
 (\360\345\352\363\360\361\350\342\355\356\343\356)d
-(\360\345\344\340\352\362\350\360\356\342\340\355\350\377)h
-(\(\344\353\377)h(\342\373\365)n(\356)n(\344\340)e
+(\360\345\344\340\352\362\350\360\356\342\340\355\350\377)i
+(\(\344\353\377)g(\342\373\365)n(\356)n(\344\340)e
 (\350\361\357\356\353\374\347\363)n(\345\362\361)n(\377)-78
 5692 y Fg(C-M-c)p Fi(\))2857 5593 y Fg(C-r)1860 6192
 y Fi(2)p eop end
@@ -5356,284 +3414,284 @@ TeXDict begin 3 2 bop -128 -45 a Fh(11)131 b
 b(\355\345\361\352)l(\356\353\374\352\350\365)g(\356\352)l(\356\355)
 -128 137 y Fi(\312\356\354\340\355\344\373,)26 b
 (\357\360\350\342\345\344\345\355\355\373\345)h(\342\356)f
-(\342\362\356\360\356\354)f(\361\362\356\353\341\366\345,)g
-(\357\360\350\354\345\355\377\376\362\361)n(\377)i(\352)g
+(\342\362\356\360\356\354)g(\361\362\356\353\341\366\345,)g
+(\357\360\350\354\345\355\377\376\362\361)n(\377)i(\352)f
 (\344\360\363\343\356\354\363)f(\364\360\375\351\354\363)h
 (\(\356\352\355\363)f(\350\361\357\356\353\374\347\363)n
 (\345\354\356\351)g(\356\352)n(\356\355\355\356\351)-128
 237 y(\361\350\361\362\345\354\373\).)-78 336 y(\363)-5
-b(\344\340\353\350\362\374)27 b(\342\361\345)g(\356\361\362)n
-(\340\353\374\355\373\345)e(\356\352\355\340)1869 b Fg(C-x)42
-b(1)-78 444 y Fi(\360\340\347\341\350\362\374)26 b(\356\352\355\356)h
-(\357\356)g(\343\356\360\350\347\356\355\362)n(\340\353\350)1824
+b(\344\340\353\350\362\374)28 b(\342\361\345)f(\356\361\362)n
+(\340\353\374\355\373\345)f(\356\352\355\340)1869 b Fg(C-x)42
+b(1)-78 444 y Fi(\360\340\347\341\350\362\374)27 b(\356\352\355\356)g
+(\357\356)g(\343\356\360\350\347\356\355\362)n(\340\353\350)1825
 b Fg(C-x)42 b(2)472 b(C-x)42 b(5)h(2)-78 543 y Fi(\363)-5
-b(\344\340\353\350\362\374)27 b(\344\340\355\355\356\345)g
+b(\344\340\353\350\362\374)28 b(\344\340\355\355\356\345)f
 (\356\352\355\356)2143 b Fg(C-x)42 b(0)472 b(C-x)42 b(5)h(0)-78
-643 y Fi(\360\340\347\341\350\362\374)26 b(\356\352\355\356)h(\357\356)
-g(\342\345\360\362\350\352)n(\340\353\350)1903 b Fg(C-x)42
-b(3)-78 743 y Fi(\342\373\357\356\353\355\350\362\374)26
-b(\357\360\356\352\360\363\362\352\363)h(\342)g
+643 y Fi(\360\340\347\341\350\362\374)27 b(\356\352\355\356)g(\357\356)
+g(\342\345\360\362\350\352)n(\340\353\350)1904 b Fg(C-x)42
+b(3)-78 743 y Fi(\342\373\357\356\353\355\350\362\374)27
+b(\357\360\356\352\360\363\362\352\363)h(\342)f
 (\344\360\363\343\356\354)h(\356\352\355\345)1530 b Fg(C-M-v)-78
-850 y Fi(\357\345\360\345\354\345\361\362\350\362\374)27
-b(\352\363\360\361\356\360)g(\342)g(\344\360\363\343\356\345)g
+850 y Fi(\357\345\360\345\354\345\361\362\350\362\374)29
+b(\352\363\360\361\356\360)e(\342)g(\344\360\363\343\356\345)g
 (\356\352\355\356)1629 b Fg(C-x)42 b(o)472 b(C-x)42 b(5)h(o)-78
-950 y Fi(\342\373\341\360\340\362\374)25 b(\341\363\364\345\360)i(\342)
+950 y Fi(\342\373\341\360\340\362\374)26 b(\341\363\364\345\360)h(\342)
 g(\344\360\363\343\356\354)h(\356\352\355\345)1795 b
 Fg(C-x)42 b(4)h(b)385 b(C-x)42 b(5)h(b)-78 1050 y Fi(\357\356\352)n
-(\340\347\340\362\374)25 b(\341\363\364\345\360)i(\342)g
+(\340\347\340\362\374)26 b(\341\363\364\345\360)h(\342)g
 (\344\360\363\343\356\354)g(\356\352\355\345)1775 b Fg(C-x)42
 b(4)h(C-o)297 b(C-x)42 b(5)h(C-o)-78 1149 y Fi
-(\347\340\343\360\363\347\350\362\374)26 b(\364\340\351\353)h(\342)g
+(\347\340\343\360\363\347\350\362\374)27 b(\364\340\351\353)g(\342)g
 (\344\360\363\343\356\345)g(\356\352\355\356)1786 b Fg(C-x)42
 b(4)h(f)385 b(C-x)42 b(5)h(f)-78 1249 y Fi
-(\356\362\352\360\373\362\374)26 b(\364\340\351\353)h(\342)g
-(\360\345\346\350\354\345)h(\367\362\345\355\350\377)g(\342)f
+(\356\362\352\360\373\362\374)28 b(\364\340\351\353)f(\342)g
+(\360\345\346\350\354\345)h(\367\362\345\355\350\377)h(\342)e
 (\344\360\363\343\356\354)g(\356\352\355\345)1149 b Fg(C-x)42
 b(4)h(r)385 b(C-x)42 b(5)h(r)-78 1349 y Fi(\347\340\357\363)n
-(\361\362\350\362\374)25 b(Dired)j(\342)f(\344\360\363\343\356\354)h
+(\361\362\350\362\374)27 b(Dired)h(\342)f(\344\360\363\343\356\354)h
 (\356\352\355\345)1766 b Fg(C-x)42 b(4)h(d)385 b(C-x)42
-b(5)h(d)-78 1448 y Fi(\355\340\351\362\350)27 b(\362)n(\340\343)g(\342)
-g(\344\360\363\343\356\354)g(\356\352\355\345)2003 b
+b(5)h(d)-78 1448 y Fi(\355\340\351\362\350)28 b(\362)n(\340\343)g(\342)
+f(\344\360\363\343\356\354)g(\356\352\355\345)2003 b
 Fg(C-x)42 b(4)h(.)385 b(C-x)42 b(5)h(.)-78 1556 y Fi
-(\363\342\345\353\350\367\350\362\374)27 b(\342\373\361\356\362\363)e
+(\363\342\345\353\350\367\350\362\374)28 b(\342\373\361\356\362\363)e
 (\356\352\355\340)2049 b Fg(C-x)42 b(\002)-78 1656 y
-Fi(\361\363\347\350\362\374)27 b(\362\345\352\363\371\345\345)f
+Fi(\361\363\347\350\362\374)28 b(\362\345\352\363\371\345\345)f
 (\356\352\355\356)2148 b Fg(C-x)42 b({)-78 1755 y Fi
-(\360\340\361\370\350\360\350\362\374)27 b
+(\360\340\361\370\350\360\350\362\374)28 b
 (\362\345\352\363\371\345\345)f(\356\352\355\356)1982
 b Fg(C-x)42 b(})-128 2001 y Fh(12)131 b
 (\324\356\360\354\340\362\350\360\356\342\340\355\350\345)-78
-2184 y Fi(\361)n(\344\345\353\340\362\374)26 b
-(\356\362\361\362\363\357)g(\344\353\377)i
-(\362\345\352\363\371\345\351)f Ff(\361\362\360\356\352\350)h
-Fi(\(\342)f(\347\340\342\350\361\350\354\356\361\362\350)f(\356\362)h
+2184 y Fi(\361)n(\344\345\353\340\362\374)27 b
+(\356\362\361\362\363\357)h(\344\353\377)g
+(\362\345\352\363\371\345\351)g Ff(\361\362\360\356\352\350)g
+Fi(\(\342)f(\347\340\342\350\361\350\354\356\361\362\350)g(\356\362)h
 (\360\345\346\350\354\340\))470 b Fg(TAB)-78 2284 y Fi(\361)n
-(\344\345\353\340\362\374)26 b(\356\362\361\362\363\357)g(\344\353\377)
-i Ff(\356\341\353\340\361\362\350)g Fi(\(\342)g
-(\347\340\342\350\361\350\354\356\361\362\350)e(\356\362)g
+(\344\345\353\340\362\374)27 b(\356\362\361\362\363\357)h(\344\353\377)
+g Ff(\356\341\353\340\361\362\350)g Fi(\(\342)g
+(\347\340\342\350\361\350\354\356\361\362\350)f(\356\362)g
 (\360\345\346\350\354\340\))775 b Fg(C-M-)p Fd(n)-78
-2383 y Fi(\361)n(\344\345\353\340\362\374)26 b
-(\356\362\361\362\363\357)g(\344\353\377)i Ff(\342\373\360\340\346)m
-(\345\355\350\377)g Fi(\(\342)f
-(\347\340\342\350\361\350\354\356\361\362\350)f(\356\362)h
+2383 y Fi(\361)n(\344\345\353\340\362\374)27 b
+(\356\362\361\362\363\357)h(\344\353\377)g Ff(\342\373\360\340\346)m
+(\345\355\350\377)h Fi(\(\342)e
+(\347\340\342\350\361\350\354\356\361\362\350)g(\356\362)h
 (\360\345\346\350\354\340\))617 b Fg(C-M-q)-78 2483 y
-Fi(\361)n(\344\345\353\340\362\374)26 b(\356\362\361\362\363\357)g
-(\352)i(\347\340\344\340\355\355\356\351)e Fe(ar)l(g)36
+Fi(\361)n(\344\345\353\340\362\374)27 b(\356\362\361\362\363\357)h
+(\352)g(\347\340\344\340\355\355\356\351)e Fe(ar)l(g)36
 b Fi(\352)n(\356\353\356\355\352)n(\345)1445 b Fg(C-x)42
-b(TAB)-78 2583 y Fi(\342\361\362)n(\340\342\350\362\374)25
-b(\355\356\342\363\376)h(\361\362\360\356\352\363)h
-(\357\356\361\353\345)g(\352\363\360\361\356\360\340)1493
-b Fg(C-o)-78 2682 y Fi(\361)n(\344\342\350\355\363\362\374)26
-b(\356\361\362)n(\340\362\356\352)f(\361\362\360\356\352\350)i
+b(TAB)-78 2583 y Fi(\342\361\362)n(\340\342\350\362\374)27
+b(\355\356\342\363\376)f(\361\362\360\356\352\363)i
+(\357\356\361\353\345)f(\352\363\360\361\356\360\340)1493
+b Fg(C-o)-78 2682 y Fi(\361)n(\344\342\350\355\363\362\374)27
+b(\356\361\362)n(\340\362\356\352)g(\361\362\360\356\352\350)h
 (\342\345\360\362\350\352)n(\340\353\374\355\356)e(\342\355\350\347)
-1293 b Fg(C-M-o)-78 2782 y Fi(\363)-5 b(\344\340\353\350\362\374)27
+1293 b Fg(C-M-o)-78 2782 y Fi(\363)-5 b(\344\340\353\350\362\374)28
 b(\357\363)n(\361\362\373\345)f(\361\362\360\356\352\350)h
-(\342\356\352\360\363\343)g(\352\363\360\361\356\360\340)1442
+(\342\356\352\360\363\343)f(\352\363\360\361\356\360\340)1442
 b Fg(C-x)42 b(C-o)-78 2882 y Fi
-(\356\341\372\345\344\350\355\350\362\374)26 b
-(\361\362\360\356\352\363)h(\361)g
+(\356\341\372\345\344\350\355\350\362\374)27 b
+(\361\362\360\356\352\363)h(\361)f
 (\357\360\345\344\373\344\363\371\345\351)h(\(\361\356)f
 (\361\353\345\344\363\376\371\350\354\350)h(arg\))817
-b Fg(M-\002)-78 2981 y Fi(\363)-5 b(\344\340\353\350\362\374)27
+b Fg(M-\002)-78 2981 y Fi(\363)-5 b(\344\340\353\350\362\374)28
 b(\357\363)n(\361\362\356\345)f
-(\357\360\356\361\362\360\340\355\361\362\342\356)f
-(\342\356\352\360\363\343)i(\352\363\360\361\356\360\340)1211
-b Fg(M-)p Fd(n)-78 3081 y Fi(\357\356\354\345\361\362\350\362\374)26
-b(\362\356\353\374\352)n(\356)g(\356)n(\344\350\355)h
+(\357\360\356\361\362\360\340\355\361\362\342\356)g
+(\342\356\352\360\363\343)g(\352\363\360\361\356\360\340)1211
+b Fg(M-)p Fd(n)-78 3081 y Fi(\357\356\354\345\361\362\350\362\374)28
+b(\362\356\353\374\352)n(\356)f(\356)n(\344\350\355)g
 (\357\360\356\341\345\353)g(\342)g(\357\356\347\350\366\350\350)h
 (\352\363\360\361\356\360\340)1036 b Fg(M-SPC)-78 3180
-y Fi(\356\362\364\356\360\354\340\362\350\360\356\342\340\362\374)23
-b(\362\345\352\363\371\350\351)k(\357\340\360\340\343\360\340\364)1513
+y Fi(\356\362\364\356\360\354\340\362\350\360\356\342\340\362\374)26
+b(\362\345\352\363\371\350\351)i(\357\340\360\340\343\360\340\364)1513
 b Fg(M-q)-78 3280 y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)
-24 b(\361\362\356\353\341\345\366)i
+26 b(\361\362\356\353\341\345\366)h
 (\347\340\357\356\353\355\345\355\350\377)1739 b Fg(C-x)42
-b(f)-78 3380 y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)24
-b(\357\360\345\364\350\352)n(\361)j
+b(f)-78 3380 y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)26
+b(\357\360\345\364\350\352)n(\361)h
 (\347\340\357\356\353\355\345\355\350\377)g(\352)n
-(\340\346\344\356\351)g(\361\362\360\356\352\350)1107
+(\340\346\344\356\351)g(\361\362\360\356\352\350)1108
 b Fg(C-x)42 b(.)-78 3479 y Fi(\363)n(\361\362)n
-(\340\355\356\342\350\362\374)24 b(\355\340)n(\367\345\360\362)n
-(\340\355\350\345)i(\(face\))1833 b Fg(M-g)-128 3725
+(\340\355\356\342\350\362\374)26 b(\355\340)n(\367\345\360\362)n
+(\340\355\350\345)h(\(face\))1833 b Fg(M-g)-128 3725
 y Fh(13)131 b(\310\347\354\345\355\345\355\350\345)44
 b(\360\345\343\350\361\362\360\340)-78 3908 y Fi(\361)n
-(\344\345\353\340\362\374)26 b(\341\363\352\342\373)h
+(\344\345\353\340\362\374)27 b(\341\363\352\342\373)g
 (\361\353\356\342\340)f(\347\340\343)n(\353\340\342\355\373\354\350)
-1672 b Fg(M-u)-78 4008 y Fi(\361)n(\344\345\353\340\362\374)26
-b(\341\363\352\342\373)h(\361\353\356\342\340)f
-(\361\362\360\356\367\355\373\354\350)1703 b Fg(M-l)-78
-4107 y Fi(\361)n(\344\345\353\340\362\374)26 b
-(\357\345\360\342\363\376)h(\341\363\352\342\363)g
+1672 b Fg(M-u)-78 4008 y Fi(\361)n(\344\345\353\340\362\374)27
+b(\341\363\352\342\373)g(\361\353\356\342\340)f
+(\361\362\360\356\367\355\373\354\350)1704 b Fg(M-l)-78
+4107 y Fi(\361)n(\344\345\353\340\362\374)27 b
+(\357\345\360\342\363\376)g(\341\363\352\342\363)g
 (\361\353\356\342\340)f(\347\340\343)n(\353\340\342\355\356\351)1457
-b Fg(M-c)-78 4207 y Fi(\361)n(\344\345\353\340\362\374)26
-b(\341\363\352\342\373)h(\356\341\353\340\361\362\350)e(\347\340\343)n
+b Fg(M-c)-78 4207 y Fi(\361)n(\344\345\353\340\362\374)27
+b(\341\363\352\342\373)g(\356\341\353\340\361\362\350)f(\347\340\343)n
 (\353\340\342\355\373\354\350)1585 b Fg(C-x)42 b(C-u)-78
-4307 y Fi(\361)n(\344\345\353\340\362\374)26 b(\341\363\352\342\373)h
-(\356\341\353\340\361\362\350)e(\361\362\360\356\367\355\373\354\350)
-1616 b Fg(C-x)42 b(C-l)-128 4553 y Fh(14)131 b
+4307 y Fi(\361)n(\344\345\353\340\362\374)27 b(\341\363\352\342\373)g
+(\356\341\353\340\361\362\350)f(\361\362\360\356\367\355\373\354\350)
+1617 b Fg(C-x)42 b(C-l)-128 4553 y Fh(14)131 b
 (\314\350\355\350\341\363\364\345\360)-128 4735 y Fi
 (\321\353\345\344\363\376\371\350\345)28 b
 (\352\353\340\342\350\370\350)f(\(\352\353\376\367\350\))i
 (\356\357\360\345\344\345\353\345\355\373)e(\342)h
 (\354\350\355\350\341\363\364\345\360\345.)-78 4833 y
-(\344\356\357\356\353\355\350\362\374)e(\355\340\361\352)n
-(\356\353\374\352)n(\356)g(\342\356\347\354\356)n(\346\355\356)1727
-b Fg(TAB)-78 4933 y Fi(\344\356\357\356\353\355\350\362\374)26
-b(\344\356)i(\356)n(\344\355\356\343\356)e(\361\353\356\342\340)1907
-b Fg(SPC)-78 5033 y Fi(\344\356\357\356\353\355\350\362\374)26
-b(\350)i(\342\373\357\356\353\355\350\362\374)2025 b
-Fg(RET)-78 5132 y Fi(\357\356\352)n(\340\347\340\362\374)25
-b(\342\356\347\354\356)n(\346\355\373\345)h
+(\344\356\357\356\353\355\350\362\374)f(\355\340\361\352)n
+(\356\353\374\352)n(\356)f(\342\356\347\354\356)n(\346\355\356)1727
+b Fg(TAB)-78 4933 y Fi(\344\356\357\356\353\355\350\362\374)27
+b(\344\356)h(\356)n(\344\355\356\343\356)e(\361\353\356\342\340)1907
+b Fg(SPC)-78 5033 y Fi(\344\356\357\356\353\355\350\362\374)27
+b(\350)h(\342\373\357\356\353\355\350\362\374)2026 b
+Fg(RET)-78 5132 y Fi(\357\356\352)n(\340\347\340\362\374)26
+b(\342\356\347\354\356)n(\346\355\373\345)g
 (\344\356\357\356\353\355\345\355\350\377)1677 b Fg(?)-78
-5232 y Fi(\342\373\341\360\340\362\374)25 b
-(\357\360\345\344\373\344\363\371\363\376)j(\361\362\360\356\352\363)f
-(\350\347)g(\350\361\362\356\360\350\350)g(\342\342\356)n(\344\340)1130
-b Fg(M-p)-78 5332 y Fi(\342\373\341\360\340\362\374)25
-b(\361\353\345\344\363\376\371\363\376)j(\361\362\360\356\352\363)f
-(\350\347)g(\350\361\362\356\360\350\350)g(\342\342\356)n(\344\340)1183
+5232 y Fi(\342\373\341\360\340\362\374)26 b
+(\357\360\345\344\373\344\363\371\363\376)i(\361\362\360\356\352\363)g
+(\350\347)f(\350\361\362\356\360\350\350)h(\342\342\356)n(\344\340)1130
+b Fg(M-p)-78 5332 y Fi(\342\373\341\360\340\362\374)26
+b(\361\353\345\344\363\376\371\363\376)i(\361\362\360\356\352\363)g
+(\350\347)f(\350\361\362\356\360\350\350)h(\342\342\356)n(\344\340)1183
 b Fg(M-n)-78 5431 y Fi(\357\356\350\361\352)28 b(\342)f
-(\350\361\362\356\360\350\350)g(\357\356)g(\360\345\343\363)-5
+(\350\361\362\356\360\350\350)h(\357\356)f(\360\345\343\363)-5
 b(\353\377\360\355\356\354\363)28 b(\342\373\360\340\346)n
-(\345\355\350\376)f(\342)g(\356\341\360\340\362\355\356\354)f
+(\345\355\350\376)f(\342)g(\356\341\360\340\362\355\356\354)g
 (\355\340\357\360\342\353\345\355\350\350)293 b Fg(M-r)-78
 5531 y Fi(\357\356\350\361\352)28 b(\342)f
-(\350\361\362\356\360\350\350)g(\357\356)g(\360\345\343\363)-5
+(\350\361\362\356\360\350\350)h(\357\356)f(\360\345\343\363)-5
 b(\353\377\360\355\356\354\363)28 b(\342\373\360\340\346)n
 (\345\355\350\376)f(\342)g(\357\360)n(\377\354\356\354)h
 (\355\340\357\360\342\353\345\355\350\350)361 b Fg(M-s)-78
-5630 y Fi(\357\360\345\360\342\340\362\374)26 b(\352)n
+5630 y Fi(\357\360\345\360\342\340\362\374)27 b(\352)n
 (\356\354\340\355\344\363)2247 b Fg(C-g)-128 5726 y Fi
-(\315\340\341\345\360\350\362\345)30 b Fg(C-x)42 b(ESC)g(ESC)30
+(\315\340\341\345\360\350\362\345)31 b Fg(C-x)42 b(ESC)g(ESC)30
 b Fi(\344\353\377)i
-(\360\345\344\340\352\362\350\360\356\342\340\355\350\377)d(\350)i
-(\357\356\342\362\356\360\345\355\350\377)f
-(\357\356\361\353\345\344\355\345\351)h(\352)n
+(\360\345\344\340\352\362\350\360\356\342\340\355\350\377)e(\350)h
+(\357\356\342\362\356\360\345\355\350\377)g
+(\357\356\361\353\345\344\355\345\351)g(\352)n
 (\356\354\340\355\344\373)f(\355\340\341\360\340\355\355\356\351)g
 (\342)h(\354\350\355\350\341\363\364\345\360\345.)-128
-5826 y(\315\340\341\345\360\350\362\345)26 b Fg(F10)p
-Fi(,)h(\367\362\356\341\373)f(\360\340\341\356\362)n(\340\362\374)e
-(\361)j(\357\363\355\352\362)n(\340\354\350)g(\354\345\355\376)i
-(\357\360\350)f(\357\356\354\356\371\350)f(\352)n(\356\354\340\355\344)
-g(\354\350\355\350\341\363\364\345\360\340.)1860 6192
+5826 y(\315\340\341\345\360\350\362\345)c Fg(F10)p Fi(,)g
+(\367\362\356\341\373)g(\360\340\341\356\362)n(\340\362\374)f(\361)h
+(\357\363\355\352\362)n(\340\354\350)h(\354\345\355\376)h(\357\360\350)
+f(\357\356\354\356\371\350)f(\352)n(\356\354\340\355\344)g
+(\354\350\355\350\341\363\364\345\360\340.)1860 6192
 y(3)p eop end
 %%Page: 4 4
 TeXDict begin 4 3 bop -128 -45 a Fh(15)131 b(\301\363\364\345\360\340)
--78 139 y Fi(\342\373\341\360\340\362\374)25 b
-(\344\360\363\343\356\351)j(\341\363\364\345\360)2071
-b Fg(C-x)42 b(b)-78 239 y Fi(\342\373\344\340\362\374)26
-b(\361\357\350\361\356\352)h(\342\361\345\365)g
+-78 139 y Fi(\342\373\341\360\340\362\374)26 b
+(\344\360\363\343\356\351)i(\341\363\364\345\360)2071
+b Fg(C-x)42 b(b)-78 239 y Fi(\342\373\344\340\362\374)27
+b(\361\357\350\361\356\352)g(\342\361\345\365)g
 (\341\363\364\345\360\356\342)1849 b Fg(C-x)42 b(C-b)-78
-338 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)26
+338 y Fi(\363\355\350\367\362\356)n(\346\350\362\374)28
 b(\341\363\364\345\360)2212 b Fg(C-x)42 b(k)-128 583
 y Fh(16)131 b(\317\345\360\345\361\362)l(\340\355\356\342\352)l(\340)44
 b(\344\340\355\355\373\365)-78 767 y Fi
-(\356\341\354\345\355\377\362\374)26 b(\354\345\361\362)n(\340\354\350)
+(\356\341\354\345\355\377\362\374)27 b(\354\345\361\362)n(\340\354\350)
 h Ff(\361\350\354\342\356\353\373)1842 b Fg(C-t)-78 867
-y Fi(\356\341\354\345\355\377\362\374)26 b(\354\345\361\362)n
+y Fi(\356\341\354\345\355\377\362\374)27 b(\354\345\361\362)n
 (\340\354\350)h Ff(\361\353\356\342\340)1982 b Fg(M-t)-78
-966 y Fi(\356\341\354\345\355\377\362\374)26 b(\354\345\361\362)n
+966 y Fi(\356\341\354\345\355\377\362\374)27 b(\354\345\361\362)n
 (\340\354\350)h Ff(\361\362\360\356\352\350)1925 b Fg(C-x)42
-b(C-t)-78 1066 y Fi(\356\341\354\345\355\377\362\374)26
+b(C-t)-78 1066 y Fi(\356\341\354\345\355\377\362\374)27
 b(\354\345\361\362)n(\340\354\350)h Ff(\342\373\360\340\346)m
-(\345\355\350\377)1726 b Fg(C-M-t)-128 1311 y Fh(17)131
+(\345\355\350\377)1727 b Fg(C-M-t)-128 1311 y Fh(17)131
 b(\317\360\356\342\345\360\352)l(\340)44 b
 (\357\360\340\342\356\357\350\361\340\355\350\377)-78
-1495 y Fi(\357\360\356\342\345\360\350\362\374)26 b
+1495 y Fi(\357\360\356\342\345\360\350\362\374)27 b
 (\362\345\352\363\371\345\345)h(\361\353\356\342\356)1974
-b Fg(M-$)-78 1594 y Fi(\357\360\356\342\345\360\350\362\374)26
-b(\342\361\345)h(\361\353\356\342\340)f(\342)i
-(\356\341\353\340\361\362\350)1775 b Fg(M-x)42 b(ispell-region)-78
-1694 y Fi(\342\373\357\356\353\355\350\362\374)26 b
-(\357\360\356\342\345\360\352\363)h(\342\361\345\343\356)f
+b Fg(M-$)-78 1594 y Fi(\357\360\356\342\345\360\350\362\374)27
+b(\342\361\345)g(\361\353\356\342\340)f(\342)i
+(\356\341\353\340\361\362\350)1776 b Fg(M-x)42 b(ispell-region)-78
+1694 y Fi(\342\373\357\356\353\355\350\362\374)27 b
+(\357\360\356\342\345\360\352\363)g(\342\361\345\343\356)f
 (\341\363\364\345\360\340)1624 b Fg(M-x)42 b(ispell-buffer)-128
 1939 y Fh(18)131 b(\322)-11 b(\345\343\350)-78 2099 y
-Fi(\355\340\351\362\350)27 b
-(\356\357\360\345\344\345\353\345\355\350\345)h(\362\345\343)n(\340)
-2036 b Fg(M-.)-78 2199 y Fi(\355\340\351\362\350)27 b
-(\361\353\345\344\363\376\371\345\345)h(\342\365)n(\356)n
-(\346\344\345\355\350\345)e(\362\345\343)n(\340)1658
+Fi(\355\340\351\362\350)28 b
+(\356\357\360\345\344\345\353\345\355\350\345)g(\362\345\343)n(\340)
+2037 b Fg(M-.)-78 2199 y Fi(\355\340\351\362\350)28 b
+(\361\353\345\344\363\376\371\345\345)g(\342\365)n(\356)n
+(\346\344\345\355\350\345)e(\362\345\343)n(\340)1659
 b Fg(C-u)42 b(M-.)-78 2299 y Fi
-(\350\361\357\356\353\374\347\356\342\340\362\374)25
-b(\355\356\342\373\351)h(\364\340\351\353)h(\361)h(\362\345\343)n
-(\340\354\350)1594 b Fg(M-x)42 b(visit-tags-tabl)o(e)-78
+(\350\361\357\356\353\374\347\356\342\340\362\374)26
+b(\355\356\342\373\351)g(\364\340\351\353)h(\361)h(\362\345\343)n
+(\340\354\350)1595 b Fg(M-x)42 b(visit-tags-tabl)o(e)-78
 2398 y Fi(\357\356\350\361\352)28 b(\357\356)f
 (\370\340\341\353\356\355\363)f(\357\356)h(\342\361\345\351)g(\362)n
-(\340\341\353\350\366\345)f(\362\345\343\356\342)1391
+(\340\341\353\350\366\345)g(\362\345\343\356\342)1392
 b Fg(M-x)42 b(tags-search)-78 2498 y Fi
-(\342\373\357\356\353\355\350\362\374)26 b(query-replace)g
+(\342\373\357\356\353\355\350\362\374)27 b(query-replace)f
 (\355\340\344)h(\342\361\345\354\350)g(\364\340\351\353\340\354\350)
 1237 b Fg(M-x)42 b(tags-query-repl)o(ace)-78 2597 y Fi(\357\360\356)n
-(\344\356\353\346\350\362\374)26 b(\357\356\350\361\352)i(\350\353\350)
+(\344\356\353\346\350\362\374)27 b(\357\356\350\361\352)h(\350\353\350)
 g(\357\356\350\361\352-\347\340\354\345\355\363)e(\362\345\343)n(\340)
-1345 b Fg(M-,)-128 2843 y Fh(19)131 b
+1346 b Fg(M-,)-128 2843 y Fh(19)131 b
 (\312\356\354\340\355\344\355\373\345)43 b
 (\357\360\356\366\345\361\361\356\360\373)-78 3026 y
-Fi(\302\373\357\356\353\355\350\362\374)27 b(\352)n
-(\356\354\340\355\344\363)f(\352)n
+Fi(\302\373\357\356\353\355\350\362\374)28 b(\352)n
+(\356\354\340\355\344\363)e(\352)n
 (\356\354\340\355\344\355\356\343\356)g
 (\357\360\356\366\345\361\361\356\360\340)1245 b Fg(M-!)-78
-3126 y Fi(\342\373\357\356\353\355\350\362\374)26 b(\352)n
-(\356\354\340\355\344\363)h(\352)n
+3126 y Fi(\342\373\357\356\353\355\350\362\374)27 b(\352)n
+(\356\354\340\355\344\363)g(\352)n
 (\356\354\340\355\344\355\356\343\356)f
 (\357\360\356\366\345\361\361\356\360\340)g(\355\340\344)i
-(\356\341\353\340\361\362\374\376)719 b Fg(M-|)-78 3225
-y Fi(\357\360\356\357\363)n(\361\362\350\362\374)26 b(\361\356)n
-(\344\345\360)n(\346\350\354\356\345)g(\356\341\353\340\361\362\350)g
-(\367\345\360\345\347)i(\352)n(\356\354\340\355\344\363)f(\352)n
+(\356\341\353\340\361\362\374\376)720 b Fg(M-|)-78 3225
+y Fi(\357\360\356\357\363)n(\361\362\350\362\374)28 b(\361\356)n
+(\344\345\360)n(\346\350\354\356\345)e(\356\341\353\340\361\362\350)h
+(\367\345\360\345\347)h(\352)n(\356\354\340\355\344\363)f(\352)n
 (\356\354\340\355\344\355\356\343\356)f
 (\357\360\356\366\345\361\361\356\360\340)210 b Fg(C-u)42
-b(M-|)-78 3325 y Fi(\347\340\357\363)n(\361\362\350\362\374)25
-b(\352)n(\356\354\340\355\344\355\373\351)j
+b(M-|)-78 3325 y Fi(\347\340\357\363)n(\361\362\350\362\374)27
+b(\352)n(\356\354\340\355\344\355\373\351)h
 (\357\360\356\366\345\361\361\356\360)e(\342)i(\356\352\355\345)f
 Fg(*shell*)1098 b(M-x)42 b(shell)-128 3571 y Fh(20)131
 b(\317\360)l(\377\354\356\363\343\356\353\374\355\373\345)44
 b(\356\341\353\340\361\362\350)-78 3755 y Fi(\361\352)n
-(\356\357\350\360\356\342\340\362\374)25 b(\357\360)n
-(\377\354\356\363\343\356\353\374\355\363\376)h
-(\356\341\353\340\361\362\374)f(\342)j(\360\345\343\350\361\362\360)
-1139 b Fg(C-x)42 b(r)h(r)-78 3854 y Fi(\363)-5 b
-(\344\340\353\350\362\374)27 b(\357\360)n
-(\377\354\356\363\343\356\353\374\355\363\376)f
-(\356\341\353\340\361\362\374)1691 b Fg(C-x)42 b(r)h(k)-78
-3954 y Fi(\342\361\362)n(\340\342\350\362\374)25 b
-(\357\356\361\353\345\344\355\363\376)i(\363\355\350\367\362\356)n
-(\346)n(\345\355\355\363\376)g(\357\360)n
-(\377\354\356\363\343\356\353\374\355\363\376)f
-(\356\341\353\340\361\362\374)637 b Fg(C-x)42 b(r)h(y)-78
-4054 y Fi(\356\362\352\360\373\362\374)26 b(\357\360)n
+(\356\357\350\360\356\342\340\362\374)26 b(\357\360)n
 (\377\354\356\363\343\356\353\374\355\363\376)g
-(\356\341\353\340\361\362\374,)g(\361)n(\344\342\350\343)n(\340\377)g
-(\362\345\352)n(\361\362)g(\342\357\360\340\342\356)821
-b Fg(C-x)42 b(r)h(o)-78 4153 y Fi(\356\367\350\361\362\350\362\374)26
-b(\357\360)n(\377\354\356\363\343\356\353\374\355\363\376)h
-(\356\341\353\340\361\362\374)1651 b Fg(C-x)42 b(r)h(c)-78
-4253 y Fi(\357\360\345\344\342\340\360\350\362\374)26
-b(\352)n(\340\346\344\363\376)i(\361\362\360\356\352\363)e
-(\361\362\360\356\352)n(\356\351)g(\362\345\352)n(\361\362)n(\340)1289
+(\356\341\353\340\361\362\374)g(\342)i(\360\345\343\350\361\362\360)
+1140 b Fg(C-x)42 b(r)h(r)-78 3854 y Fi(\363)-5 b
+(\344\340\353\350\362\374)28 b(\357\360)n
+(\377\354\356\363\343\356\353\374\355\363\376)e
+(\356\341\353\340\361\362\374)1692 b Fg(C-x)42 b(r)h(k)-78
+3954 y Fi(\342\361\362)n(\340\342\350\362\374)27 b
+(\357\356\361\353\345\344\355\363\376)g(\363\355\350\367\362\356)n
+(\346)n(\345\355\355\363\376)h(\357\360)n
+(\377\354\356\363\343\356\353\374\355\363\376)e
+(\356\341\353\340\361\362\374)638 b Fg(C-x)42 b(r)h(y)-78
+4054 y Fi(\356\362\352\360\373\362\374)28 b(\357\360)n
+(\377\354\356\363\343\356\353\374\355\363\376)e
+(\356\341\353\340\361\362\374,)h(\361)n(\344\342\350\343)n(\340\377)f
+(\362\345\352)n(\361\362)i(\342\357\360\340\342\356)821
+b Fg(C-x)42 b(r)h(o)-78 4153 y Fi(\356\367\350\361\362\350\362\374)28
+b(\357\360)n(\377\354\356\363\343\356\353\374\355\363\376)f
+(\356\341\353\340\361\362\374)1652 b Fg(C-x)42 b(r)h(c)-78
+4253 y Fi(\357\360\345\344\342\340\360\350\362\374)27
+b(\352)n(\340\346\344\363\376)h(\361\362\360\356\352\363)f
+(\361\362\360\356\352)n(\356\351)g(\362\345\352)n(\361\362)n(\340)1291
 b Fg(C-x)42 b(r)h(t)-128 4498 y Fh(21)131 b
 (\321\356\352\360\340\371\345\355\350\377)-78 4682 y
-Fi(\344\356\341\340\342\350\362\374)25 b(\343)n
-(\353\356\341\340\353\374\355\356\345)g
+Fi(\344\356\341\340\342\350\362\374)26 b(\343)n
+(\353\356\341\340\353\374\355\356\345)f
 (\361\356\352\360\340\371\345\355\350\345)1675 b Fg(C-x)42
-b(a)h(g)-78 4781 y Fi(\344\356\341\340\342\350\362\374)25
-b(\353\356\352)n(\340\353\374\355\356\345)h(\344\353\377)i
+b(a)h(g)-78 4781 y Fi(\344\356\341\340\342\350\362\374)26
+b(\353\356\352)n(\340\353\374\355\356\345)g(\344\353\377)i
 (\360\345\346\350\354\340)f(\361\356\352\360\340\371\345\355\350\345)
 1220 b Fg(C-x)42 b(a)h(l)-78 4881 y Fi
-(\344\356\341\340\342\350\362\374)25 b(\343)n
-(\353\356\341\340\353\374\355\356\345)g(\347\355\340)n
+(\344\356\341\340\342\350\362\374)26 b(\343)n
+(\353\356\341\340\353\374\355\356\345)f(\347\355\340)n
 (\367\345\355\350\345)i(\344\353\377)h(\344\340\355\355\356\343\356)e
 (\361\356\352\360\340\371\345\355\350\377)813 b Fg(C-x)42
-b(a)h(i)g(g)-78 4981 y Fi(\344\356\341\340\342\350\362\374)25
-b(\361\357\345\366\350\364\350\367\345\361\352)n(\356\345)i
+b(a)h(i)g(g)-78 4981 y Fi(\344\356\341\340\342\350\362\374)26
+b(\361\357\345\366\350\364\350\367\345\361\352)n(\356\345)h
 (\344\353\377)h(\360\345\346\350\354\340)f(\347\355\340)n
 (\367\345\355\350\345)g(\344\340\355\355\356\343\356)g
 (\361\356\352\360\340\371\345\355\350\377)342 b Fg(C-x)42
 b(a)h(i)g(l)-78 5080 y Fi(\377\342\355\356)27 b(\342\361\362)n
-(\340\342\350\362\374)d(\347\355\340)n(\367\345\355\350\345)j
+(\340\342\350\362\374)f(\347\355\340)n(\367\345\355\350\345)h
 (\344\353\377)h(\361\356\352\360\340\371\345\355\350\377)1395
 b Fg(C-x)42 b(a)h(e)-78 5180 y Fi
 (\344\350\355\340\354\350\367\345\361\352\350)28 b
-(\344\356\357\356\353\355\350\362\374)f
-(\357\360\345\344\373\344\363\371\345\345)g(\361\353\356\342\356)1287
+(\344\356\357\356\353\355\350\362\374)g
+(\357\360\345\344\373\344\363\371\345\345)f(\361\353\356\342\356)1287
 b Fg(M-/)1860 6192 y Fi(4)p eop end
 %%Page: 5 5
 TeXDict begin 5 4 bop -128 -45 a Fh(22)131 b(\320)l(\345\343\363)-7
@@ -5642,22 +3700,22 @@ b(\353\377\360\355\373\345)44 b(\342\373\360\340\346)l
 b(\356)n(\344\350\355\356\367\355\373\351)g(\361\350\354\342\356\353)g
 (\(\347\340)h(\350\361\352\353\376\367\345\355\350\345\354)g
 (\361\350\354\342\356\353\340)f(\355\356\342\356\351)f
-(\361\362\360\356\352\350\))387 b Fg(.)43 b Fi(\(dot\))-78
+(\361\362\360\356\352\350\))388 b Fg(.)43 b Fi(\(dot\))-78
 239 y(\355\356\353\374)27 b(\350\353\350)h(\341\356\353\345\345)f
-(\357\356\342\362\356\360\345\355\350\351)1900 b Fg(*)-78
+(\357\356\342\362\356\360\345\355\350\351)1901 b Fg(*)-78
 338 y Fi(\356)n(\344\355\356)27 b(\350\353\350)h(\341\356\353\345\345)e
-(\357\356\342\362\356\360\345\355\350\351)1903 b Fg(+)-78
+(\357\356\342\362\356\360\345\355\350\351)1904 b Fg(+)-78
 438 y Fi(\355\356\353\374)27 b(\350\353\350)h(\356)n(\344\355\356)f
-(\357\356\342\362\356\360\345\355\350\345)1939 b Fg(?)-78
-537 y Fi(\375\352\360\340\355\350\360\356\342\340\362\374)25
-b(\361\357\345\366\350\340\353\374\355\373\351)i
+(\357\356\342\362\356\360\345\355\350\345)1940 b Fg(?)-78
+537 y Fi(\375\352\360\340\355\350\360\356\342\340\362\374)26
+b(\361\357\345\366\350\340\353\374\355\373\351)h
 (\361\350\354\342\356\353)h Fe(c)1536 b Fd(n)p Fe(c)-78
 637 y Fi(\342\373\341\356\360)26 b(\354\345\346\344\363)i(\340\353\374)
-n(\362\345\360\355\340\362\350\342\340\354\350)d
+n(\362\345\360\355\340\362\350\342\340\354\350)f
 (\(\020\350\353\350\021\))1501 b Fd(nj)-78 737 y Fi
 (\343\360\363\357\357\350\360\356\342\352)n(\340)2454
 b Fd(n)p Fg(\()42 b Fc(:)14 b(:)g(:)44 b Fd(n)p Fg(\))-78
-836 y Fi(\362\345\352)n(\361\362)27 b(\342)g Fe(n)6 b
+836 y Fi(\362\345\352)n(\361\362)29 b(\342)e Fe(n)6 b
 Fi(-\351)27 b(\343\360\363\357\357\345)2227 b Fd(n)p
 Fe(n)-78 936 y Fi(\343\360\340\355\350\366\340)27 b
 (\361\353\356\342\340)2394 b Fd(n)p Fg(b)-78 1036 y Fi(\355\345)28
@@ -5667,7 +3725,7 @@ b(\355\340)m(\367\340\353\356)79 b(\361\356\356\362-)2857
 1243 y(\342\345\362\361\362\342\350\377)3547 1144 y(\352)m
 (\356\355\345\366)127 b(\361\356\356\362-)3547 1243 y
 (\342\345\362\361\362\342\350\377)-78 1343 y Fi(\361\362\360\356\352)n
-(\340)2682 b Fg(\002)646 b($)-78 1442 y Fi(\361\353\356\342\356)2726
+(\340)2683 b Fg(\002)645 b($)-78 1442 y Fi(\361\353\356\342\356)2726
 b Fd(n)p Fg(<)604 b Fd(n)p Fg(>)-78 1542 y Fi(\341\363\364\345\360)2701
 b Fd(n)p Fg(`)604 b Fd(n)p Fg(')-78 1650 y Ff(\352\353\340\361\361)33
 b(\361\350\354\342\356\353\356\342)2262 b
@@ -5676,162 +3734,162 @@ b(\361\350\354\342\356\353\356\342)2262 b
 1750 y(\361\362\342\363)m(\345\362)131 b(\344\360\363-)3547
 1849 y(\343\350\354)-78 1949 y Fi(\377\342\355\373\351)28
 b(\355\340\341\356\360)2450 b Fg([)43 b Fc(:)14 b(:)g(:)43
-b Fg(])419 b([\002)p Fc(:)14 b(:)g(:)42 b Fg(])-78 2048
+b Fg(])419 b([\002)p Fc(:)14 b(:)g(:)41 b Fg(])-78 2048
 y Fi(\361\350\354\342\356\353-\341\363\352\342\340)2423
 b Fd(n)p Fg(w)604 b Fd(n)p Fg(W)-78 2148 y Fi(\361\350\354\342\356\353)
-27 b(\361)h(\361\350\355\362)n(\340\352)n(\361\350\361\356\354)e
+27 b(\361)h(\361\350\355\362)n(\340\352)n(\361\350\361\356\354)f
 Fe(c)2039 b Fd(n)p Fg(s)p Fe(c)566 b Fd(n)p Fg(S)p Fe(c)-128
 2394 y Fh(23)131 b(\314\345\346\344\363\355\340\360\356)l
 (\344\355\373\345)43 b(\355\340\341\356\360\373)g
 (\361\350\354\342\356\353\356\342)-78 2578 y Fi
-(\342\373\341\360\340\362\374)25 b(\377\347\373\352)2406
+(\342\373\341\360\340\362\374)26 b(\377\347\373\352)2406
 b Fg(C-x)42 b(RET)g(l)-78 2677 y Fi(\357\356\352)n
-(\340\347\340\362\374)25 b(\342\361\345)i(\342\356\347\354\356)n
-(\346\355\373\345)f(\354\345\362\356)n(\344\373)h(\342\342\356)n
+(\340\347\340\362\374)26 b(\342\361\345)h(\342\356\347\354\356)n
+(\346\355\373\345)f(\354\345\362\356)n(\344\373)i(\342\342\356)n
 (\344\340)1457 b Fg(M-x)42 b(list-input-meth)o(ods)-78
-2777 y Fi(\360\340\347\360\345\370\350\362\374)26 b(\350\353\350)i
-(\347\340\357\360\345\362\350\362\374)e(\354\345\362\356)n(\344)h
+2777 y Fi(\360\340\347\360\345\370\350\362\374)27 b(\350\353\350)h
+(\347\340\357\360\345\362\350\362\374)g(\354\345\362\356)n(\344)g
 (\342\342\356)n(\344\340)1473 b Fg(C-)p Fd(n)-78 2877
-y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)24
-b(\361\350\361\362\345\354\363)j(\352)n(\356)n
-(\344\350\360\356\342\340\355\350\377)f(\344\353\377)i
+y Fi(\363)n(\361\362)n(\340\355\356\342\350\362\374)26
+b(\361\350\361\362\345\354\363)i(\352)n(\356)n
+(\344\350\360\356\342\340\355\350\377)e(\344\353\377)i
 (\361\353\345\344\363\376\371\345\351)f(\352)n
 (\356\354\340\355\344\373)705 b Fg(C-x)42 b(RET)g(c)-78
-2976 y Fi(\357\356\352)n(\340\347\340\362\374)25 b
-(\361\357\350\361\356\352)j(\342\361\345\365)e
-(\361\350\361\362\345\354)i(\352)n(\356)n
+2976 y Fi(\357\356\352)n(\340\347\340\362\374)26 b
+(\361\357\350\361\356\352)i(\342\361\345\365)e
+(\361\350\361\362\345\354)j(\352)n(\356)n
 (\344\350\360\356\342\340\355\350\377)1338 b Fg(M-x)42
 b(list-coding-sys)o(tem)o(s)-78 3076 y Fi(\342\373\341\360\340\362\374)
-25 b(\357\360\345\344\357\356\367\362\350\362\345\353\374\355\363\376)i
-(\361\350\361\362\345\354\363)g(\352)n(\356)n
+26 b(\357\360\345\344\357\356\367\362\350\362\345\353\374\355\363\376)j
+(\361\350\361\362\345\354\363)f(\352)n(\356)n
 (\344\350\360\356\342\340\355\350\377)1041 b Fg(M-x)42
 b(prefer-coding-s)o(yst)o(em)-128 3329 y Fh(24)131 b
 (\310\355\364\356\360\354\340\366\350\377)44 b
 (\(\361\350\361\362\345\354\340)g(Info\))-78 3519 y Fi
-(\347\340\357\363)n(\361\362\350\362\374)25 b
-(\361\350\361\362\345\354\363)j(\344\356\361\362\363\357\340)e(\352)h
-(\344\356\352\363\354\345\355\362)n(\340\366\350\350)1274
-b Fg(C-h)42 b(i)-78 3619 y Fi(\355\340\351\362\350)27
-b(\363\352)n(\340\347\340\355\355\363\376)g
+(\347\340\357\363)n(\361\362\350\362\374)27 b
+(\361\350\361\362\345\354\363)i(\344\356\361\362\363\357\340)e(\352)g
+(\344\356\352\363\354\345\355\362)n(\340\366\350\350)1275
+b Fg(C-h)42 b(i)-78 3619 y Fi(\355\340\351\362\350)28
+b(\363\352)n(\340\347\340\355\355\363\376)f
 (\364\363\355\352\366\350\376)g(\350\353\350)h
 (\357\345\360\345\354\345\355\355\363\376)h(\342)e
-(\344\356\352\363\354\345\355\362)n(\340\366\350\350)614
+(\344\356\352\363\354\345\355\362)n(\340\366\350\350)615
 b Fg(C-h)42 b(S)-128 3719 y Fi
 (\317\345\360\345\354\345\371\345\355\350\345)28 b
-(\342\355\363\362\360\350)e(\363\347\353\340)h(\(\355\356)n
+(\342\355\363\362\360\350)f(\363\347\353\340)g(\(\355\356)n
 (\344\340\354\350\):)-78 3818 y(\357\360\356\352\360\363\362\352)n
-(\340)f(\342\357\345\360\345\344)2257 b Fg(SPC)-78 3917
-y Fi(\357\360\356\352\360\363\362\352)n(\340)26 b(\355\340\347\340\344)
-2298 b Fg(DEL)-78 4017 y Fi(\357\345\360\345\351\362\350)28
-b(\352)f(\355\340)n(\367\340\353\363)g(\363\347\353\340)2074
+(\340)g(\342\357\345\360\345\344)2257 b Fg(SPC)-78 3917
+y Fi(\357\360\356\352\360\363\362\352)n(\340)27 b(\355\340\347\340\344)
+2298 b Fg(DEL)-78 4017 y Fi(\357\345\360\345\351\362\350)29
+b(\352)e(\355\340)n(\367\340\353\363)g(\363\347\353\340)2074
 b Fg(.)43 b Fi(\(dot\))-128 4112 y
 (\317\345\360\345\354\345\371\345\355\350\345)28 b
 (\354\345\346\344\363)g(\363\347\353\340\354\350:)-78
-4206 y Ff(\361\353\345\344\363\376\371\350\351)g Fi(\363\347\345\353)
-2245 b Fg(n)-78 4306 y Ff(\357\360\345\344\373\344\363\371\350\351)28
+4206 y Ff(\361\353\345\344\363\376\371\350\351)f Fi(\363\347\345\353)
+2245 b Fg(n)-78 4306 y Ff(\357\360\345\344\373\344\363\371\350\351)27
 b Fi(\363\347\345\353)2184 b Fg(p)-78 4405 y Fi
-(\357\345\360\345\351\362\350)28 b(\352)f Ff(\342\345\360)m
+(\357\345\360\345\351\362\350)29 b(\352)e Ff(\342\345\360)m
 (\365\355\345\354\363)h Fi(\363\347\353\363)1932 b Fg(u)-78
-4505 y Fi(\342\373\341\360\340\362\374)25 b(\357\363\355\352\362)j
-(\354\345\355\376)g(\357\356)f(\350\354\345\355\350)1769
-b Fg(m)-78 4605 y Fi(\342\373\341\360\340\362\374)25
-b Fe(n)6 b Fi(-\351)28 b(\357\363\355\352\362)f(\354\345\355\376)i
+4505 y Fi(\342\373\341\360\340\362\374)26 b(\357\363\355\352\362)j
+(\354\345\355\376)f(\357\356)f(\350\354\345\355\350)1769
+b Fg(m)-78 4605 y Fi(\342\373\341\360\340\362\374)26
+b Fe(n)6 b Fi(-\351)28 b(\357\363\355\352\362)g(\354\345\355\376)h
 (\357\356)e(\355\356\354\345\360\363)g(\(1\0259\))1357
-b Fe(n)-78 4704 y Fi(\357\345\360\345\351\362\350)28
-b(\357\356)f(\361\361\373\353\352)n(\345)g
-(\(\342\356\347\342\360\340\362)f(\361)h(\357\356\354\356\371\374\376)g
+b Fe(n)-78 4704 y Fi(\357\345\360\345\351\362\350)29
+b(\357\356)e(\361\361\373\353\352)n(\345)g
+(\(\342\356\347\342\360\340\362)g(\361)g(\357\356\354\356\371\374\376)g
 Fg(l)p Fi(\))1330 b Fg(f)-78 4804 y Fi
-(\342\356\347\342\360\340\362\350\362\361)n(\377)25 b(\352)i
+(\342\356\347\342\360\340\362\350\362\361)n(\377)27 b(\352)g
 (\357\356\361\353\345\344\355\345\354\363)h
-(\357\360\356\361\354\356\362\360\345\355\355\356\354\363)e
+(\357\360\356\361\354\356\362\360\345\355\355\356\354\363)f
 (\363\347\353\363)1089 b Fg(l)-78 4904 y Fi
-(\342\356\347\342\360\340\362\350\362\361)n(\377)25 b(\352)i
-(\363\347\353\363-\352)n(\340\362)n(\340\353\356\343\363)1840
-b Fg(d)-78 5003 y Fi(\317\345\360\345\351\362\350)27
-b(\352)h(\342\345\360)n(\365)n(\345\354\363)e(\363\347\353\363)i
+(\342\356\347\342\360\340\362\350\362\361)n(\377)27 b(\352)g
+(\363\347\353\363-\352)n(\340\362)n(\340\353\356\343\363)1841
+b Fg(d)-78 5003 y Fi(\317\345\360\345\351\362\350)28
+b(\352)g(\342\345\360)n(\365)n(\345\354\363)e(\363\347\353\363)i
 (\364\340\351\353\340)1748 b Fg(t)-78 5103 y Fi
-(\357\345\360\345\351\362\350)28 b(\352)f(\363\347\353\363)-7
+(\357\345\360\345\351\362\350)29 b(\352)e(\363\347\353\363)-7
 b(,)28 b(\347\340\344\340\355\355\356\354\363)e
 (\350\354\345\355\345\354)1617 b Fg(g)-128 5198 y Fi
 (\304\360\363\343\350\345)27 b(\352)n(\356\354\340\355\344\373:)-78
-5292 y(\347\340\357\363)n(\361\362\350\362\374)e Ff
-(\363\367\345\341\355\350\352)j Fi(\357\356)f
-(\361\350\361\362\345\354\345)h(\344\356\352\363\354\345\355\362)n
-(\340\366\350\350)1182 b Fg(h)-78 5392 y Fi(\357\356\350\361\352)28
-b(\362\345\354\373)f(\342)g(\350\355\344\345\352)n(\361\345)2107
+5292 y(\347\340\357\363)n(\361\362\350\362\374)g Ff
+(\363\367\345\341\355\350\352)h Fi(\357\356)f
+(\361\350\361\362\345\354\345)i(\344\356\352\363\354\345\355\362)n
+(\340\366\350\350)1183 b Fg(h)-78 5392 y Fi(\357\356\350\361\352)28
+b(\362\345\354\373)g(\342)f(\350\355\344\345\352)n(\361\345)2107
 b Fg(i)-78 5491 y Fi(\357\356\350\361\352)28 b(\342)f
 (\363\347\353\340\365)g(\361)g(\357\356\354\356\371\374\376)g
 (\360\345\343\363)-5 b(\353\377\360\355\373\365)28 b
 (\342\373\360\340\346)n(\345\355\350\351)1028 b Fg(s)-78
 5591 y Ff(\357\360\345\352\360\340\362\350\362\374)32
 b(\360\340\341\356\362\363)d Fi(\361)e
-(\344\356\352\363\354\345\355\362)n(\340\366\350\345\351)1454
+(\344\356\352\363\354\345\355\362)n(\340\366\350\345\351)1455
 b Fg(q)1860 6192 y Fi(5)p eop end
 %%Page: 6 6
 TeXDict begin 6 5 bop -128 -45 a Fh(25)131 b(\320)l
 (\345\343\350\361\362\360\373)-78 139 y Fi(\361\356)n
-(\365\360\340\355\350\362\374)26 b(\356\341\353\340\361\362\374)f(\342)
-i(\360\345\343\350\361\362\360\345)1809 b Fg(C-x)42 b(r)h(s)-78
-239 y Fi(\342\361\362)n(\340\342\350\362\374)25 b(\361\356)n
-(\344\345\360)n(\346\350\354\356\345)h
-(\360\345\343\350\361\362\360\340)h(\342)g(\341\363\364\345\360)1435
+(\365\360\340\355\350\362\374)27 b(\356\341\353\340\361\362\374)f(\342)
+h(\360\345\343\350\361\362\360\345)1810 b Fg(C-x)42 b(r)h(s)-78
+239 y Fi(\342\361\362)n(\340\342\350\362\374)27 b(\361\356)n
+(\344\345\360)n(\346\350\354\356\345)f
+(\360\345\343\350\361\362\360\340)i(\342)f(\341\363\364\345\360)1435
 b Fg(C-x)42 b(r)h(i)-78 338 y Fi(\361\356)n
-(\365\360\340\355\350\362\374)26 b(\357\356\353\356)n(\346)n
-(\345\355\350\345)g(\352\363\360\361\356\360\340)h(\342)g
-(\360\345\343\350\361\362\360\345)1364 b Fg(C-x)42 b(r)h(SPC)-78
-438 y Fi(\357\345\360\345\351\362\350)28 b(\352)f(\357\356\353\356)n
+(\365\360\340\355\350\362\374)27 b(\357\356\353\356)n(\346)n
+(\345\355\350\345)f(\352\363\360\361\356\360\340)h(\342)g
+(\360\345\343\350\361\362\360\345)1365 b Fg(C-x)42 b(r)h(SPC)-78
+438 y Fi(\357\345\360\345\351\362\350)29 b(\352)e(\357\356\353\356)n
 (\346)n(\345\355\350\376)g(\352\363\360\361\356\360\340,)g(\361\356)n
 (\365\360\340\355\345\355\355\356\354\363)f(\342)h
-(\360\345\343\350\361\362\360\345)774 b Fg(C-x)42 b(r)h(j)-128
+(\360\345\343\350\361\362\360\345)775 b Fg(C-x)42 b(r)h(j)-128
 683 y Fh(26)131 b(\312\353\340\342\350\340\362\363\360\355\373\345)44
 b(\354\340\352\360\356\361\373)-78 867 y Ff(\355\340)m
 (\367\340\362\374)29 b Fi(\356\357\360\345\344\345\353\345\355\350\345)
-e(\352\353\340\342\350\340\362\363\360\355\356\343\356)e
+e(\352\353\340\342\350\340\362\363\360\355\356\343\356)f
 (\354\340\352\360\356\361\340)1227 b Fg(C-x)42 b(\()-78
 966 y Ff(\347\340\352)m(\356\355\367\350\362\374)29 b
 Fi(\356\357\360\345\344\345\353\345\355\350\345)e
-(\352\353\340\342\350\340\362\363\360\355\356\343\356)e
+(\352\353\340\342\350\340\362\363\360\355\356\343\356)f
 (\354\340\352\360\356\361\340)1077 b Fg(C-x)42 b(\))-78
 1066 y Ff(\342\373\357\356\353\355\350\362\374)27 b Fi
 (\357\356\361\353\345\344\355\350\351)h
 (\356\357\360\345\344\345\353\345\355\355\373\351)g
 (\354\340\352\360\356\361)1187 b Fg(C-x)42 b(e)-78 1165
-y Fi(\344\356\357\356\353\355\350\362\374)26 b
-(\357\356\361\353\345\344\355\350\351)i
+y Fi(\344\356\357\356\353\355\350\362\374)27 b
+(\357\356\361\353\345\344\355\350\351)h
 (\356\357\360\345\344\345\353\345\355\355\373\351)g
 (\354\340\352\360\356\361)1260 b Fg(C-u)42 b(C-x)g(\()-78
-1265 y Fi(\347\340\344\340\362\374)26 b(\350\354\377)i(\344\353\377)g
+1265 y Fi(\347\340\344\340\362\374)27 b(\350\354\377)h(\344\353\377)g
 (\357\356\361\353\345\344\355\345\343\356)f
 (\356\357\360\345\344\345\353\345\355\355\356\343\356)f
 (\354\340\352\360\356\361\340)990 b Fg(M-x)42 b(name-last-kbd-m)o(acr)o
-(o)-78 1365 y Fi(\342\361\362)n(\340\342\350\362\374)25
-b(\342)i(\341\363\364\345\360)f
+(o)-78 1365 y Fi(\342\361\362)n(\340\342\350\362\374)27
+b(\342)g(\341\363\364\345\360)f
 (\356\357\360\345\344\345\353\345\355\350\345)i
 (\354\340\352\360\356\361\340)e(\355\340)i(\377\347\373\352)n(\345)f
 (Lisp)898 b Fg(M-x)42 b(insert-kbd-macr)o(o)-128 1611
 y Fh(27)131 b(\312\356\354\340\355\344\373,)43 b
 (\361\342\377\347\340\355\355\373\345)h(\361)h(Emacs)e(Lisp)-78
-1794 y Fi(\342\373\367\350\361\353\350\362\374)27 b Ff
-(\342\373\360\340\346)m(\345\355\350\345)g Fi(\357\345\360\345\344)h
+1794 y Fi(\342\373\367\350\361\353\350\362\374)28 b Ff
+(\342\373\360\340\346)m(\345\355\350\345)g Fi(\357\345\360\345\344)g
 (\352\363\360\361\356\360\356\354)1389 b Fg(C-x)42 b(C-e)-78
-1894 y Fi(\342\373\367\350\361\353\350\362\374)27 b
-(\362\345\352\363\371\363\376)g(\364\363\355\352\366\350\376)g
+1894 y Fi(\342\373\367\350\361\353\350\362\374)28 b
+(\362\345\352\363\371\363\376)g(\364\363\355\352\366\350\376)f
 Ff(defun)1518 b Fg(C-M-x)-78 1994 y Fi
-(\342\373\367\350\361\353\350\362\374)27 b Ff
-(\356\341\353\340\361\362\374)h Fi(\352)n(\340\352)f
+(\342\373\367\350\361\353\350\362\374)28 b Ff
+(\356\341\353\340\361\362\374)g Fi(\352)n(\340\352)f
 (\342\373\360\340\346)n(\345\355\350\345)1561 b Fg(M-x)42
-b(eval-region)-78 2093 y Fi(\361\367\350\362)n(\340\362\374)26
-b(\350)i(\342\373\367\350\361\353\350\362\374)e(\342\373\360\340\346)n
-(\345\355\350\345)h(\350\347)g
+b(eval-region)-78 2093 y Fi(\361\367\350\362)n(\340\362\374)28
+b(\350)g(\342\373\367\350\361\353\350\362\374)f(\342\373\360\340\346)n
+(\345\355\350\345)g(\350\347)g
 (\354\350\355\350\341\363\364\345\360\340)1078 b Fg(M-:)-78
-2193 y Fi(\347\340\343\360\363\347\350\362\374)26 b(\350\347)i
-(\361\362)n(\340\355\344\340\360\362\355\356\343\356)c
-(\361\350\361\362\345\354\355\356\343\356)j(\352)n(\340\362)n
-(\340\353\356\343)n(\340)1112 b Fg(M-x)42 b(load-library)-128
+2193 y Fi(\347\340\343\360\363\347\350\362\374)27 b(\350\347)h
+(\361\362)n(\340\355\344\340\360\362\355\356\343\356)e
+(\361\350\361\362\345\354\355\356\343\356)i(\352)n(\340\362)n
+(\340\353\356\343)n(\340)1113 b Fg(M-x)42 b(load-library)-128
 2438 y Fh(28)131 b(\317\360\356\361\362)l(\340\377)45
 b(\355\340\361\362\360\356\351\352)l(\340)-78 2619 y
-Fi(\355\340\361\362\360\356\350\362\374)26 b
-(\357\345\360\345\354\345\355\355\373\345)i(\350)f
+Fi(\355\340\361\362\360\356\350\362\374)28 b
+(\357\345\360\345\354\345\355\355\373\345)g(\350)f
 (\356\364\356\360\354\353\345\355\350\345)g(\(faces\))1249
 b Fg(M-x)42 b(customize)-128 2720 y Fi
 (\321\356\347\344\340\355\350\345)27 b(\343)n
@@ -5852,25 +3910,25 @@ b(\315\340\357\350\361\340\355\350\345)44 b(\352)l
 4421 y(\(recenter)h(\(if)k(\(null)e(line\))570 4521 y(0)483
 4621 y(\(prefix-numeric)o(-v)o(al)o(ue)c(line\)\)\)\))-128
 4803 y Fi(\321\357\345\366\350\364\350\352)n(\340\366\350\377)30
-b Fg(interactive)25 b Fi(\361\356\356\341\371\340\345\362)i(\356)i
-(\362\356\354,)g(\367\362\356)g(\340\360\343\363\354\345\355\362)g
-(\355\340\344\356)f(\361\367\350\362\373\342\340\362\374)g
-(\350\355\362\345\360\340\352\362\350\342\355\356.)g(\304\353\377)h
+b Fg(interactive)25 b Fi(\361\356\356\341\371\340\345\362)j(\356)h
+(\362\356\354,)h(\367\362\356)g(\340\360\343\363\354\345\355\362)g
+(\355\340\344\356)e(\361\367\350\362\373\342\340\362\374)i
+(\350\355\362\345\360\340\352\362\350\342\355\356.)g(\304\353\377)f
 (\344\356\357\356\353\355\350-)-128 4903 y
-(\362\345\353\374\355\356\351)e
-(\350\355\364\356\360\354\340\366\350\350)g
-(\355\340\341\345\360\350\362\345)f Fg(C-h)43 b(f)g(interactive)p
+(\362\345\353\374\355\356\351)f
+(\350\355\364\356\360\354\340\366\350\350)f
+(\355\340\341\345\360\350\362\345)g Fg(C-h)43 b(f)g(interactive)p
 Fi(.)1110 5391 y Fb(Cop)n(yrigh)n(t)1461 5389 y(c)1441
-5391 y Fa(\015)23 b Fb(2006)i(F)-6 b(ree)25 b(Soft)n(w)n(are)g(F)-6
-b(oundation,)25 b(Inc.)1214 5470 y(v2.3)f(for)g(GNU)g(Emacs)f(v)n
-(ersion)i(22,)f(June)g(2006)1453 5549 y(designed)g(b)n(y)g(Stephen)i
+5391 y Fa(\015)23 b Fb(2007)i(F)-6 b(ree)25 b(Soft)n(w)n(are)g(F)-6
+b(oundation,)25 b(Inc.)1214 5470 y(v2.3)f(for)g(GNU)g(Emacs)e(v)n
+(ersion)j(22,)f(June)g(2006)1453 5549 y(designed)g(b)n(y)g(Stephen)i
 (Gildea)1242 5628 y(\317\345\360\345\342\356)n(\344)f(Alex)e(Ott)h
-(<alexott@gmail.com>)-128 5707 y(P)n(ermission)32 b(is)g(gran)n(ted)i
-(to)f(mak)n(e)f(and)h(distribute)g(copies)g(of)e(this)h(card)i(pro)n
-(vided)f(the)g(cop)n(yrigh)n(t)h(notice)f(and)g(this)f(p)r(ermission)g
-(notice)h(are)-128 5786 y(preserv)n(ed)27 b(on)c(all)g(copies.)-128
-5864 y(F)-6 b(or)28 b(copies)f(of)f(the)h(GNU)f(Emacs)h(man)n(ual,)f
-(write)h(to)g(the)h(F)-6 b(ree)27 b(Soft)n(w)n(are)h(F)-6
+(<alexott@gmail.com>)-128 5707 y(P)n(ermission)31 b(is)h(gran)n(ted)i
+(to)f(mak)n(e)e(and)i(distribute)g(copies)g(of)e(this)h(card)i(pro)n
+(vided)f(the)g(cop)n(yrigh)n(t)h(notice)f(and)g(this)f(p)r(ermission)f
+(notice)i(are)-128 5786 y(preserv)n(ed)27 b(on)c(all)g(copies.)-128
+5864 y(F)-6 b(or)28 b(copies)f(of)f(the)h(GNU)f(Emacs)g(man)n(ual,)f
+(write)i(to)g(the)h(F)-6 b(ree)27 b(Soft)n(w)n(are)h(F)-6
 b(oundation,)28 b(Inc.,)e(51)h(F)-6 b(ranklin)27 b(Street,)h(Fifth)e
 (Flo)r(or,)h(Boston,)g(MA)-128 5943 y(02110-1301)f(USA)1860
 6192 y Fi(6)p eop end
diff --git a/etc/ru-refcard.tex b/etc/ru-refcard.tex
index 6305285961c..2853c65a115 100644
--- a/etc/ru-refcard.tex
+++ b/etc/ru-refcard.tex
@@ -1,5 +1,5 @@
 % Copyright (C) 1997, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+%   2006, 2007  Free Software Foundation, Inc.
 
 \documentclass[10pt]{article}
 \usepackage{multicol,tabularx}
@@ -20,7 +20,8 @@
 \setlength{\ColThreeWidth}{25mm}
 
 \newcommand{\versionnumber}[0]{2.3}
-\newcommand{\nyear}[0]{2006}
+\newcommand{\versionemacs}[0]{22}
+\newcommand{\nyear}[0]{2007}
 
 \newcommand\shortcopyrightnotice[0]{\vskip 1ex plus 2 fill
   \centerline{\footnotesize \copyright\ \nyear\ Free Software Foundation, Inc.
@@ -29,7 +30,7 @@
 \newcommand\copyrightnotice[0]{
 \vskip 1ex plus 2 fill\begingroup\footnotesize
 \centerline{Copyright \copyright\ \nyear\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 22, June \nyear}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, June 2006}
 \centerline{designed by Stephen Gildea}
 \centerline{ðÅÒÅ×ÏÄ Alex Ott <alexott@gmail.com>}
 
@@ -54,11 +55,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 %\begin{multicols}{3}
 
 \centerline{óÐÒÁ×ÏÞÎÉË ËÏÍÁÎÄ GNU Emacs}
-\centerline{(ÄÌÑ ×ÅÒÓÉÉ 22)}
+\centerline{(ÄÌÑ ×ÅÒÓÉÉ \versionemacs)}
 
 \section{úÁÐÕÓË Emacs}
 
-äÌÑ ÚÁÐÕÓËÁ GNU Emacs 22, ÐÒÏÓÔÏ ÎÁÂÅÒÉÔÅ ÉÍÑ ÐÒÏÇÒÁÍÍÙ: \kbd{emacs}
+äÌÑ ÚÁÐÕÓËÁ GNU Emacs \versionemacs, ÐÒÏÓÔÏ ÎÁÂÅÒÉÔÅ ÉÍÑ ÐÒÏÇÒÁÍÍÙ: \kbd{emacs}
 
 \section{÷ÙÈÏÄ ÉÚ Emacs}
 
diff --git a/etc/ses-example.ses b/etc/ses-example.ses
index d0fb9198e20..3cbeb587b19 100644
--- a/etc/ses-example.ses
+++ b/etc/ses-example.ses
@@ -206,7 +206,7 @@ Sales summary - Acme fundraising
 ;;; symbolic-formulas: (("Eastern area") ("West-district") ("North&South") ("Other"))
 ;;; End:
 
-;;; Copyright (c) 2002, 2006
+;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
 ;;; Free Software Foundation, Inc.
 
 ;;; COPYING PERMISSIONS:
diff --git a/etc/sk-dired-ref.tex b/etc/sk-dired-ref.tex
index 82a3d2a5be0..ac94ef3c3d5 100644
--- a/etc/sk-dired-ref.tex
+++ b/etc/sk-dired-ref.tex
@@ -1,6 +1,6 @@
 % Reference Card for Dired
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % Slovak hyphenation rules applied
 \shyph
@@ -49,8 +49,9 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{0.1}
-\def\year{2006}
-\def\version{May \year\ v\versionnumber}
+\def\versionemacs{21}
+\def\year{2007}
+\def\version{May 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -60,7 +61,7 @@
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
 \centerline{designed by Stephen Gildea, \version}
-\centerline{for GNU Emacs version 21 on Unix systems}
+\centerline{for GNU Emacs version \versionemacs{} on Unix systems}
 \centerline{Updated for Dired in May 2000 by Evgeny Roubinchtein}
 
 Permission is granted to make and distribute copies of
@@ -256,7 +257,7 @@ MA 02110-1301, USA.
 
 \title{Referenèná karta pre Dired}
 
-\centerline{(urèené pre Dired v GNU Emacse 21.x)}
+\centerline{(urèené pre Dired v GNU Emacse \versionemacs.x)}
 \centerline{Príkazy oznaèené \dx{} vy¾adujú dired-x}
 
 % trim this down to fit everything on one page
diff --git a/etc/sk-refcard.tex b/etc/sk-refcard.tex
index 353451ecc27..1182e50b82d 100644
--- a/etc/sk-refcard.tex
+++ b/etc/sk-refcard.tex
@@ -11,8 +11,8 @@
 
 \columnsperpage=1
 
-% Copyright (C) 1987, 1993, 1996, 1997, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+% Copyright (C) 1987, 1993, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -68,7 +68,9 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{2.2}
-\def\year{2006}
+\def\versionemacs{21}
+\def\versionyear{2006}          % last update
+\def\year{2007}                 % latest copyright year
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
@@ -77,7 +79,7 @@
 \def\copyrightnotice{
 \vskip 1ex plus 2 fill\begingroup\small
 \centerline{Copyright \copyright\ \year\ Free Software Foundation, Inc.}
-\centerline{v\versionnumber{} for GNU Emacs version 21, \year}
+\centerline{v\versionnumber{} for GNU Emacs version \versionemacs, \versionyear}
 \centerline{designed by Stephen Gildea}
 
 Permission is granted to make and distribute copies of
@@ -267,11 +269,11 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 \title{GNU Emacs -- Referenèná karta}
 
-\centerline{(pre verziu 21)}
+\centerline{(pre verziu \versionemacs)}
 
 \section{Spustenie Emacsu}
 
-Pre spustenie GNU~Emacsu~21 napí¹te jeho meno: \kbd{emacs}
+Pre spustenie GNU~Emacsu~\versionemacs{} napí¹te jeho meno: \kbd{emacs}
 
 Ako naèíta» a editova» súbory sa dozviete ni¾¹ie v~oddiele Súbory.
 
diff --git a/etc/sk-survival.tex b/etc/sk-survival.tex
index 4cd12672ada..658e501b063 100644
--- a/etc/sk-survival.tex
+++ b/etc/sk-survival.tex
@@ -21,8 +21,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -51,12 +51,13 @@
 % e.g. in the TeX Live CD).
 
 \def\versionnumber{1.0}
-\def\year{2006}
+\def\versionemacs{21}
+\def\year{2007}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
     Copyright \year\ Free Software Foundation, Inc.\break
-    Verzia \versionnumber{} pre GNU Emacs 21, apríl 2000\break
+    Verzia \versionnumber{} pre GNU Emacs \versionemacs, apríl 2000\break
     W{\l}odek Bzyl (matwb@univ.gda.pl)\break
     Do èe¹tiny prelo¾il Pavel Janík (Pavel@Janik.cz)
     Do slovenèiny prelo¾il Miroslav Va¹ko (vasko@debian.cz)
@@ -166,7 +167,7 @@
 %**end of header
 
 
-\title{Karta\ \ pre\ \ pre¾itie\ \ s\ \ GNU\ \ Emacsom}{pre verziu 21}
+\title{Karta\ \ pre\ \ pre¾itie\ \ s\ \ GNU\ \ Emacsom}{pre verziu \versionemacs}
 
 V~nasledujúcom texte \kbd{C-z} znamená: stlaète klávesu {\it Ctrl}, dr¾te ju
 a súèasne stlaète klávesu `\kbd{z}'. \kbd{M-z} znamená, ¾e
diff --git a/etc/survival.tex b/etc/survival.tex
index 8c56232d7ad..59583430896 100644
--- a/etc/survival.tex
+++ b/etc/survival.tex
@@ -25,8 +25,8 @@
   \endinput
 \fi
 
-% Copyright (C) 2000, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -46,12 +46,13 @@
 % Boston, MA 02110-1301, USA.
 
 \def\versionnumber{1.0}
-\def\year{2006}
+\def\versionemacs{21}
+\def\year{2007}                 % latest copyright year
 
 \def\copyrightnotice{\penalty-1\vfill
   \vbox{\smallfont\baselineskip=0.8\baselineskip\raggedcenter
     Copyright \year\ Free Software Foundation, Inc.\break
-    Version \versionnumber{} for GNU Emacs 21, April 2000\break
+    Version \versionnumber{} for GNU Emacs \versionemacs, April 2000\break
     Project W{\l}odek Bzyl (matwb@univ.gda.pl)
 
     Permission is granted to make and distribute copies of
@@ -159,7 +160,7 @@
 %**end of header
 
 
-\title{GNU\ \ Emacs\ \ Survival\ \ Card}{for version 21}
+\title{GNU\ \ Emacs\ \ Survival\ \ Card}{for version \versionemacs}
 
 In the following, \kbd{C-z} means hit the `\kbd{z}' key while
 holding down the {\it Ctrl}\ \ key. \kbd{M-z} means hit the
diff --git a/etc/ulimit.hack b/etc/ulimit.hack
index d804459ba0b..674a9613b60 100644
--- a/etc/ulimit.hack
+++ b/etc/ulimit.hack
@@ -37,8 +37,8 @@ exit 0
 #
 # Upon system reboot, all processes will inherit the new large ulimit.
 
-# Copyright (c) 1999, 2003, 2006
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 
 # COPYING PERMISSIONS:
 #
diff --git a/etc/vipcard.tex b/etc/vipcard.tex
index 693667bd076..6bd0fabdf9f 100644
--- a/etc/vipcard.tex
+++ b/etc/vipcard.tex
@@ -7,8 +7,8 @@
 
 \columnsperpage=1
 
-% Copyright (C) 1987, 2002, 2003, 2004, 2005,
-%   2006 Free Software Foundation, Inc.
+% Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+%   2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -55,8 +55,8 @@
 
 
 \def\versionnumber{1.2}
-\def\year{2006}
-\def\version{September \year\ v\versionnumber}
+\def\year{2007}
+\def\version{September 2006\ v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/etc/viperCard.tex b/etc/viperCard.tex
index b2761126837..a4d80fcf668 100644
--- a/etc/viperCard.tex
+++ b/etc/viperCard.tex
@@ -7,8 +7,8 @@
 
 \columnsperpage=2
 
-% Copyright (C) 1995, 1996, 1997, 2002, 2003, 2004,
-%   2005, 2006 Free Software Foundation, Inc.
+% Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
+%   2005, 2006, 2007  Free Software Foundation, Inc.
 
 % This file is part of GNU Emacs.
 
@@ -62,8 +62,8 @@
 
 
 \def\versionnumber{3.0}
-\def\year{2006}
-\def\version{August \year\ v\versionnumber}
+\def\year{2007}
+\def\version{August 2006 v\versionnumber}
 
 \def\shortcopyrightnotice{\vskip 1ex plus 2 fill
   \centerline{\small \copyright\ \year\ Free Software Foundation, Inc.
diff --git a/leim/CXTERM-DIC/4Corner.tit b/leim/CXTERM-DIC/4Corner.tit
index 8b52b531d64..c73d9e389e9 100644
--- a/leim/CXTERM-DIC/4Corner.tit
+++ b/leim/CXTERM-DIC/4Corner.tit
@@ -1,9 +1,11 @@
+# $Id: 4Corner.tit,v 1.5 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
 # .cit version 2
 ENCODE:	BIG5
+AUTOSELECT:	NO
 PROMPT:	¥|¨¤¸¹½X::\040
-AUTOSELECT:	NEVER
+#
 COMMENT 
 COMMENT Copyright (c) 2001 Christian Wittern <chris@ccbs.ntu.edu.tw>
 COMMENT 
@@ -14,11 +16,10 @@ COMMENT
 COMMENT	Authors: Dr. Urs App, Christian Wittern (Kyoto Univ, Japan)
 COMMENT
 COMMENT Input:  ¥|¨¤¸¹½X (¤Î¤@ªþ¥[½X)
-# input key definitions
+# define keys
 VALIDINPUTKEY:	0123456789
 WILDCARDKEY:	*
 WILDCHARKEY:	?
-# choice list keys
 SELECTKEY:	1\040
 SELECTKEY:	2
 SELECTKEY:	3
@@ -29,17 +30,11 @@ SELECTKEY:	7
 SELECTKEY:	8
 SELECTKEY:	9
 SELECTKEY:	0
+BACKSPACE:	\010\177
+DELETEALL:	\015\025
 MOVERIGHT:	.>
 MOVELEFT:	,<
-# pre-editing keys
-BACKSPACE:	\010\177		# ctrl-H,  DEL
-DELETEALL:	\015\025		# RETURN,  ctrl-U
-CURSOR-BEGIN:	\001			# ctrl-A
-CURSOR-END:	\005			# ctrl-E
-CURSOR-FORW:	\006			# ctrl-F
-CURSOR-BACK:	\002			# ctrl-B
-CURSOR-ERASE:	\004			# ctrl-D
-REPEATKEY:	\020\022		# ctrl-P,  ctrl-R
+REPEATKEY:	\020\022
 # the following line must not be removed
 BEGINDICTIONARY
 #
diff --git a/leim/CXTERM-DIC/CCDOSPY.tit b/leim/CXTERM-DIC/CCDOSPY.tit
index 5b135288de1..cca16b62d09 100644
--- a/leim/CXTERM-DIC/CCDOSPY.tit
+++ b/leim/CXTERM-DIC/CCDOSPY.tit
@@ -1,9 +1,10 @@
+# $Id: CCDOSPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	GB
-MULTICHOICE:	YES
-PROMPT:	ºº×ÖÊäÈë¡ËËõдƴÒô¡Ë£ 
+AUTOSELECT:	NO
+PROMPT:	ºº×ÖÊäÈë¡ËËõдƴÒô¡Ë\040
 #
 COMMENT ËõдƴÒô·½°¸ (Ô´ÓÚ CCDOS)
 COMMENT
@@ -15,6 +16,8 @@ COMMENT       Æ´Òô¡Ã   a    guo   zhong  wen  guang  yu   quan
 COMMENT       ¼üÈë¡Ã   a1   guo4   as1   wf4  guh1  yu..6 qvj6
 # define keys
 VALIDINPUTKEY:	abcdefghijklmnopqrstuvwxyz
+WILDCARDKEY:	*
+WILDCHARKEY:	?
 SELECTKEY:	1\040
 SELECTKEY:	2
 SELECTKEY:	3
diff --git a/leim/CXTERM-DIC/PY-b5.tit b/leim/CXTERM-DIC/PY-b5.tit
index 5ef45b85466..ae330dbc906 100644
--- a/leim/CXTERM-DIC/PY-b5.tit
+++ b/leim/CXTERM-DIC/PY-b5.tit
@@ -1,14 +1,11 @@
+# $Id: PY-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
-# Generated from PY-b5.cit by cit2tit
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	BIG5
-MULTICHOICE:	YES
-PROMPT:	¤¤¤å¿é¤J¡i«÷­µ¡j
+AUTOSELECT:	NO
+PROMPT:	º~¦r¿é¤J::«÷­µ::\040
 #
-COMMENT last modified by cyl@ifcss.org 1994 March 9
-COMMENT Modify by Wei-Chung Hwang, OCT 15, 1992.
-COMMENT
 COMMENT	º~»y«÷­µ¿é¤J¤è®×¤¶²Ð   (ª`­µ²Å¸¹¹ï·Ó)
 COMMENT	
 COMMENT				Án¥À (CONSONANT)
@@ -44,6 +41,8 @@ COMMENT	j+ -> ¸òÁn¥À j,q,x «÷ªº®É­Ô,   l+ -> ¸òÁn¥À l,n «÷ªº®É­Ô
 COMMENT
 # define keys
 VALIDINPUTKEY:	12345:abcdefghijklmnopqrstuvwxyz
+WILDCARDKEY:	*
+WILDCHARKEY:	?
 SELECTKEY:	1\040
 SELECTKEY:	2
 SELECTKEY:	3
@@ -163,7 +162,7 @@ bing2
 bing3	»æ¤þ¸[¬`ªÃ¬±ÎôÍÔÌ}ï@»Ð×®ÍÜÐ~Ò÷«Ìε
 bing4	¨Ã¯f¨Ö¦}´¬ØÖïxÔR
 bing5	
-bo1	¬Á¼·­éµÔ²ÚågÒÜÞë×·ðÔø[ÔqÏYóQÌi
+bo1	ªi¬Á¼·­éµÔ²ÚågÒÜÞë×·ðÔø[ÔqÏYóQÌi
 bo2	§B³Õ¬fªy«k·i´ñ»éÁ¡²ä©­²íºä²ò½³»K¹YèÁ¹`õÎñÐçôÒJöJäc
 bo2	ñWìaàûñ®õfÕÅî¬ÀÐì`ÐcѴުߴèwïÌðcò¡ùRÓöù{ò®
 bo3	¶_ðװ
@@ -993,7 +992,7 @@ leng5
 li1	­ù
 li2	Â÷¼þ¾¤±ùÆXÂç¼ù¿©»©Æz²pºvöè¯WòÔ¸ÄÄùùÏáuîqõ¶Õ¼åúíÐëI
 li2	åøÍù÷ðÜƳííÌñNùÎ÷ÑöÛößöxá}åËðÛóÑóîöàÄRÛzøMøuÓN÷Ç
-li3	§õ¨½¸Ì²z§ùØ­ù¯@ÃU®[«Z¿CÅÝÄ¿Äùø×¾YßUàTÎ~øô
+li3	§õ¨½¸Ì²z§­ù¯@ÃU®[«Z¿CÅÝÄ¿Äùø×¾YßUàTÎ~øô
 li4	¤O¥ß§QÄR¾úÃc¨Ò¾ä²ú¼FÀyÄr²É»YÆEÃwÄ×ÁõÄt¦O¯ï®ß·X«Wµg
 li4	Â~²Á©Ñ°æÅ°²|Ûàñò·ÌÄ÷ôUÍBõæòR÷eòtïgÒªôsê¼ÐkÑEÉv÷`°z
 li4	°¬ôqÒõâÔøHÌlÉñÅÏô¡Ð²ì¤ÏíïòÒÚÕ`שØdßSãtãïðVòHòrô¾öF
diff --git a/leim/CXTERM-DIC/QJ-b5.tit b/leim/CXTERM-DIC/QJ-b5.tit
index eb5a558bfb7..9b18b52486c 100644
--- a/leim/CXTERM-DIC/QJ-b5.tit
+++ b/leim/CXTERM-DIC/QJ-b5.tit
@@ -1,21 +1,17 @@
+# $Id: QJ-b5.tit,v 1.3 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
-# Generated from QJ-b5.cit by cit2tit
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	BIG5
-MULTICHOICE:	NO
-PROMPT:	¤¤¤å¿é¤J¡i¥þ§Î¡j
+AUTOSELECT:	YES
+PROMPT:	º~¦r¿é¤J::¥þ¨¤::
 #
 COMMENT Copyright 1991 by Yongguang Zhang.      (ygz@cs.purdue.edu)
 COMMENT Permission to use/modify/copy for any purpose is hereby granted.
 COMMENT Absolutely no warranties.
-COMMENT Modify by Wei-Chung Hwang, OCT 15, 1992.
 # define keys
 VALIDINPUTKEY:	\040!"\043$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMN
 VALIDINPUTKEY:	OPQRSTUVWXYZ[\134]^_`abcdefghijklmnopqrstuvwxyz{|}~
-BACKSPACE:	\010\177
-DELETEALL:	\015\025
-REPEATKEY:	\020\022
 # the following line must not be removed
 BEGINDICTIONARY
 #
diff --git a/leim/CXTERM-DIC/QJ.tit b/leim/CXTERM-DIC/QJ.tit
index b591f1326af..06c67708072 100644
--- a/leim/CXTERM-DIC/QJ.tit
+++ b/leim/CXTERM-DIC/QJ.tit
@@ -1,9 +1,10 @@
+# $Id: QJ.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	GB
-MULTICHOICE:	NO
-PROMPT:	ºº×ÖÊäÈë¡ËÈ«½Ç¡Ë£ 
+AUTOSELECT:	YES
+PROMPT:	ºº×ÖÊäÈë¡ËÈ«½Ç¡Ë
 #
 COMMENT Copyright 1991 by Yongguang Zhang.      (ygz@cs.purdue.edu)
 COMMENT Permission to use/modify/copy for any purpose is hereby granted.
diff --git a/leim/CXTERM-DIC/README b/leim/CXTERM-DIC/README
new file mode 100644
index 00000000000..6714459c2ee
--- /dev/null
+++ b/leim/CXTERM-DIC/README
@@ -0,0 +1,58 @@
+All *.tit files in this directory are dictionary files to use with
+the program cxterm.  Their source and copyright status are categorised
+into these four groups.
+
+(1) QJ-b5.tit (renamed from .../cxterm/dict/big5/QJ.tit)
+    QJ.tit (copied from .../cxterm/dict/gb/QJ.tit)
+
+These are verbatim copies of those included in the directory
+contrib/clients/cxterm of the distribution of X11R6.  Each file
+contains a license notice.
+
+(2) CCDOSPY.tit (copied from .../cxterm/dict/gb/CCDOSPY.tit)
+    PY-b5.tit (renamed from .../cxterm/dict/big5/PY.tit)
+    SW.tit (copied from .../cxterm/dict/gb/SW.tit)
+    TONEPY.tit (copied from .../cxterm/dict/gb/TONEPY.tit)
+
+These are verbatim copies of those included in the directory
+contrib/clients/cxterm of the distribution of X11R6.  As those files
+themselves don't contain license notices, the section 6 of the file
+.../cxterm/README should cover them:
+
+============================================================
+6. COPYRIGHTS AND TERMS
+
+This copyright and permission notice outlines the rights and
+restrictions covering most parts of this distribution of cxterm.
+Cxterm is modified from xterm, which is copyrighted by MIT.
+Some individual files are covered by other copyrights.  Utils
+parts are redistributed software covered by their own copyrights
+and terms.  Please see individual file's copyright notices.
+
+X11R6 CXTERM (C) 1994 BY YONGGUANG ZHANG.
+X11R5 CXTERM (C) 1991 BY YONGGUANG ZHANG AND MAN-CHI PONG.
+
+Permission to use, copy, modify, and distribute this software and
+its documentation for any purpose is hereby granted without fee,
+provided that this entire copyright and permission notice appear
+in all such copies, and that the name of the authors may not be
+used to endorse or promote products derived from this material
+without specific prior written permission.  The authors make no
+representations about the suitability of this software for any
+purpose.  It is provided "as is" without express or implied warranty.
+============================================================
+
+(3) 4Corner.tit
+    ARRAY30.tit
+    ETZY.tit
+    ZOZY.tit
+
+These are versions modified by the original authors from those
+distributed with X11R5 to include proper copyright notices.  Each file
+contains a license notice.
+
+(4) ECDICT.tit, Punct-b5.tit, Punct.tit
+
+These are verbatim copies of those distributed at
+ftp://ftp.ifcss.org/pub/software/.  Each file contains a license
+notice.
diff --git a/leim/CXTERM-DIC/SW.tit b/leim/CXTERM-DIC/SW.tit
index fed48d62e67..b32c73762d4 100644
--- a/leim/CXTERM-DIC/SW.tit
+++ b/leim/CXTERM-DIC/SW.tit
@@ -1,15 +1,18 @@
+# $Id: SW.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	GB
-MULTICHOICE:	YES
-PROMPT:	ºº×ÖÊäÈë¡ËÊ×β¡Ë£ 
+AUTOSELECT:	NO
+PROMPT:	ºº×ÖÊäÈë¡ËÊ×β¡Ë\040
 #
 COMMENT	(Ô´ÓÚ CCDOS)
 COMMENT	Êéд¸Ãºº×ÖʱµÄ¡¸Êױʡ¹¼°¡¸Î²±Ê¡¹¡£ÀýÈ磬¡¾ÂÀ¡¿Ê×β±Ê½ÔΪ¡¸¿Ú¡¹£¬¹ÊÔÚ
 COMMENT ¡¸Ê×β¡¹Ä£Ê½ÖÐÓà ff0 Èý¼üÊäÈë¡££¨ f ¼üÔÚ¡¸Ê×β¡¹Ä£Ê½Öбíʾ¡¸¿Ú¡¹£©
 # define keys
 VALIDINPUTKEY:	abcdefghijklmnopqrstuvwxyz
+WILDCARDKEY:	*
+WILDCHARKEY:	?
 SELECTKEY:	1\040
 SELECTKEY:	2
 SELECTKEY:	3
diff --git a/leim/CXTERM-DIC/TONEPY.tit b/leim/CXTERM-DIC/TONEPY.tit
index a93bf9dcb64..46b8df61bbe 100644
--- a/leim/CXTERM-DIC/TONEPY.tit
+++ b/leim/CXTERM-DIC/TONEPY.tit
@@ -1,9 +1,10 @@
+# $Id: TONEPY.tit,v 1.4 2007/01/24 06:35:08 handa Exp $
 # HANZI input table for cxterm
 # To be used by cxterm, convert me to .cit format first
-# .cit version 1
+# .cit version 2
 ENCODE:	GB
-MULTICHOICE:	YES
-PROMPT:	ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë£ 
+AUTOSELECT:	NO
+PROMPT:	ºº×ÖÊäÈë¡Ë´øµ÷Æ´Òô¡Ë\040
 #
 COMMENT	´øµ÷Æ´Òô·½°¸
 COMMENT
@@ -11,6 +12,8 @@ COMMENT СдӢÎÄ×Öĸ´ú±í¡¸Æ´Òô¡¹·ûºÅ£¬ "u(yu) ÔòÓà u: ±íʾ¡Ã
 COMMENT Òôµ÷ÓÃÊý×Ö±íʾ£¬ 12345 ·Ö±ð´ú±íÒõƽ¡¢Ñôƽ¡¢ÉÏÉù¡¢ÏÂÉù¼°ÇáÉù
 # define keys
 VALIDINPUTKEY:	12345:abcdefghijklmnopqrstuvwxyz
+WILDCARDKEY:	*
+WILDCHARKEY:	?
 SELECTKEY:	1\040
 SELECTKEY:	2
 SELECTKEY:	3
diff --git a/leim/ChangeLog b/leim/ChangeLog
index 57e8f626c61..53879b2aef6 100644
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,21 @@
+2007-01-24  Kenichi Handa  <handa@m17n.org>
+
+	* MISC-DIC/README: New file.
+
+	* CXTERM-DIC/README: New file.
+
+	* CXTERM-DIC/4Corner.tit, CXTERM-DIC/CCDOSPY.tit,
+	CXTERM-DIC/PY-b5.tit, CXTERM-DIC/QJ-b5.tit, CXTERM-DIC/QJ.tit,
+	CXTERM-DIC/SW.tit, CXTERM-DIC/TONEPY.tit: Updated from
+	X11R6/contrib/programs/cxterm.
+
+	* ja-dic/ja-dic.el: Regenerated.
+
+2007-01-12  Kenichi Handa  <handa@m17n.org>
+
+	* quail/uni-input.el (ucs-input-method): Signal an error for a
+	Unicode character that is not yet supported.
+
 2006-12-26  Andreas Schwab  <schwab@suse.de>
 
 	* Makefile.in (datarootdir): Define.
@@ -1660,7 +1678,8 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1997, 1998, 1999, 2001 Free Software Foundation, Inc.
+    Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
+	2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/leim/MISC-DIC/README b/leim/MISC-DIC/README
new file mode 100644
index 00000000000..5c5aef93ce9
--- /dev/null
+++ b/leim/MISC-DIC/README
@@ -0,0 +1,46 @@
+The source and copyright status of dictionary files in this directory
+are categorised into these three groups.
+
+(1) cangjie-table.b5
+    cangjie-table.cns
+
+These are verbatim copies of those distributed by the author Christian
+Wittern himself.  Each file contains a license notice.
+
+(2) CTLau.html
+    CTLau-b5.html
+
+These are verbatim copies of those distributed at the author's home page
+<umunhum.stanford.edu/~lee/chicomp/>. Each file contains a license
+notice.
+
+(3) pinyin.map
+    ziranma.cin
+
+These are verbatim copies of those distributed with a free package
+called CCE at:
+	http://ftp.debian.org/debian/dists/potato/main
+		/source/utils/cce_0.36.orig.tar.gz
+
+As those files themselves don't contain license notices, the
+copyright/license notice of the package itself should cover them:
+
+============================================================
+            Copyright (C) 1999, Rui He, herui@cs.duke.edu
+
+
+                 CCE(Console Chinese Environment) 0.32
+
+CCE is free software; you can redistribute it and/or modify it under the
+terms of the GNU General Public License as published by the Free Software
+Foundation; either version 1, or (at your option) any later version.
+
+CCE is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+details.
+
+You should have received a copy of the GNU General Public License along with
+CCE; see the file COPYING.  If not, write to the Free Software Foundation,
+51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.")
+============================================================
diff --git a/leim/Makefile.in b/leim/Makefile.in
index 950f2734aab..4c5d9b68751 100644
--- a/leim/Makefile.in
+++ b/leim/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for leim subdirectory in GNU Emacs.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
diff --git a/leim/README b/leim/README
index 0e4a4c1ee93..7c853febf2a 100644
--- a/leim/README
+++ b/leim/README
@@ -31,6 +31,6 @@ dictionary (See below).
 ja-dic:
 
 This directory contains Emacs Lisp source file ja-dic.el which is
-generated from a source dictionary in SKK-DIC directory.  In addition,
-it contains a byte compiled file ja-dic.elc for users convenience
-because it takes rather long time to byte-compile ja-dic.el.
+generated from a source dictionary in SKK-DIC directory.  The
+inclusion of this file is for users convenience because it takes
+rather long time to generate it.
diff --git a/leim/SKK-DIC/README b/leim/SKK-DIC/README
index f2a6313bc98..e3b76e0832e 100644
--- a/leim/SKK-DIC/README
+++ b/leim/SKK-DIC/README
@@ -1,4 +1,4 @@
-The file SKK-JISYO.L is a verbatim copy of what distributed with SKK
+The file SKK-JISYO.L is a verbatim copy of that distributed with SKK
 Ver.8.6.  The author of SKK is Masahiko Sato
 <masahiko@sato.riec.tohoku.ac.jp>.  SKK is free software distributed
 under the terms of the GNU General Public License.
diff --git a/leim/ja-dic/ja-dic.el b/leim/ja-dic/ja-dic.el
index 75affe6a400..1866131c28b 100644
--- a/leim/ja-dic/ja-dic.el
+++ b/leim/ja-dic/ja-dic.el
@@ -1,7 +1,9 @@
 ;;; ja-dic.el --- dictionary for Japanese input method -*-coding: iso-2022-jp;-*-
 ;;	Generated by the command `skkdic-convert'
-;;	Date: Sat Dec 16 09:09:04 2000
-;;	Original SKK dictionary file: SKK-JISYO.L
+;;	Date: Wed Jan 24 15:18:03 2007
+;;	Original SKK dictionary file: ../SKK-DIC/SKK-JISYO.L
+
+;; This file is part of GNU Emacs.
 
 ;;; Commentary:
 
@@ -20,8 +22,6 @@
 ;; Yukiyoshi Kameyama, Akihiko Sasaki, Dai Ando, Junichi Okukawa, 
 ;; Katsushi Sato and Nobuhiro Yamagishi
 ;; 
-;; This file is part of GNU Emacs.
-;;
 ;; This dictionary is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
 ;; the Free Software Foundation; either versions 2, or (at your option)
@@ -54583,5 +54583,5 @@
 ;;
 (provide 'ja-dic)
 
-;;; arch-tag: 18f1f3f5-d706-4c5d-bdac-a6a762de287d
+;; arch-tag: 18f1f3f5-d706-4c5d-bdac-a6a762de287d
 ;;; ja-dic.el ends here
diff --git a/leim/leim-ext.el b/leim/leim-ext.el
index cdbea2edecd..0970572c3a0 100644
--- a/leim/leim-ext.el
+++ b/leim/leim-ext.el
@@ -1,8 +1,8 @@
 ;; leim-ext.el -- extra leim configuration	-*- coding:iso-2022-7bit; -*-
 
-;; Copyright (C) 2004, 2006
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005, 2006
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H13PRO009
 
diff --git a/leim/makefile.w32-in b/leim/makefile.w32-in
index 7c1b4fdd99f..08022d38cf2 100644
--- a/leim/makefile.w32-in
+++ b/leim/makefile.w32-in
@@ -1,7 +1,7 @@
 # -*- Makefile -*- for leim subdirectory in GNU Emacs on the Microsoft W32 API.
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   Free Software Foundation, Inc.
-# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 #   National Institute of Advanced Industrial Science and Technology (AIST)
 #   Registration Number H14PRO021
 
diff --git a/leim/quail/croatian.el b/leim/quail/croatian.el
index 29b802b2914..3d932566e33 100644
--- a/leim/quail/croatian.el
+++ b/leim/quail/croatian.el
@@ -1,6 +1,6 @@
 ;;; quail/croatian.el -- Quail package for inputing Croatian  -*-coding: iso-8859-2;-*-
 
-;; Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Nik¹iæ <hniksic@xemacs.org>,
 ;;         modeled after czech.el by Milan Zamazal.
diff --git a/leim/quail/cyril-jis.el b/leim/quail/cyril-jis.el
index 6ac7b456d9a..16301bc8b45 100644
--- a/leim/quail/cyril-jis.el
+++ b/leim/quail/cyril-jis.el
@@ -1,7 +1,9 @@
 ;;; cyril-jis.el --- Quail package for inputting JISX0208 Cyrillic letters
 
-;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/cyrillic.el b/leim/quail/cyrillic.el
index e44229599e9..df58b811907 100644
--- a/leim/quail/cyrillic.el
+++ b/leim/quail/cyrillic.el
@@ -1,8 +1,9 @@
 ;;; cyrillic.el --- Quail package for inputting Cyrillic characters
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/czech.el b/leim/quail/czech.el
index 7c1134d7c75..ab32c3e798b 100644
--- a/leim/quail/czech.el
+++ b/leim/quail/czech.el
@@ -1,6 +1,7 @@
 ;;; czech.el --- Quail package for inputting Czech -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1998, 2001, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
 ;; Maintainer: Pavel Jan,Bm(Bk <Pavel@Janik.cz>
diff --git a/leim/quail/ethiopic.el b/leim/quail/ethiopic.el
index dd85cfe384b..993dec32f01 100644
--- a/leim/quail/ethiopic.el
+++ b/leim/quail/ethiopic.el
@@ -1,6 +1,7 @@
 ;;; ethiopic.el --- Quail package for inputting Ethiopic characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/georgian.el b/leim/quail/georgian.el
index fbc71645b92..d207eb11a0d 100644
--- a/leim/quail/georgian.el
+++ b/leim/quail/georgian.el
@@ -1,6 +1,7 @@
 ;;; georgian.el --- Quail package for inputting Georgian characters  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/leim/quail/greek.el b/leim/quail/greek.el
index 9c266a2f8f5..caeae315f21 100644
--- a/leim/quail/greek.el
+++ b/leim/quail/greek.el
@@ -1,7 +1,9 @@
 ;;; greek.el --- Quail package for inputting Greek -*-coding: iso-2022-7bit-*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hangul.el b/leim/quail/hangul.el
index 0ed46752bc1..38b399150b2 100644
--- a/leim/quail/hangul.el
+++ b/leim/quail/hangul.el
@@ -1,7 +1,9 @@
 ;;; hangul.el --- Quail package for inputting Korean Hangul characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hangul3.el b/leim/quail/hangul3.el
index 7bd8ed85ca0..b554f019827 100644
--- a/leim/quail/hangul3.el
+++ b/leim/quail/hangul3.el
@@ -1,7 +1,9 @@
 ;;; hangul3.el --- Quail package for inputting Korean Hangul characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hanja-jis.el b/leim/quail/hanja-jis.el
index 569ed8273fe..30e2aecfb20 100644
--- a/leim/quail/hanja-jis.el
+++ b/leim/quail/hanja-jis.el
@@ -1,6 +1,7 @@
 ;;; hanja-jis.el --- Quail package for inputting Korean Hanja (JISX0208)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hanja.el b/leim/quail/hanja.el
index 1ef047410d4..553e4607e6b 100644
--- a/leim/quail/hanja.el
+++ b/leim/quail/hanja.el
@@ -1,7 +1,9 @@
 ;;; hanja.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/hanja3.el b/leim/quail/hanja3.el
index f04e16ac196..b3f94b577f4 100644
--- a/leim/quail/hanja3.el
+++ b/leim/quail/hanja3.el
@@ -1,6 +1,7 @@
 ;;; hanja3.el --- Quail-package for Korean Hanja (KSC5601)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1999, 2002, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Koaunghi Un <koanughi.un@zdv.uni-tuebingen.de>
 ;; Keywords: mule, quail, multilingual, input method, Korean, Hanja
diff --git a/leim/quail/hebrew.el b/leim/quail/hebrew.el
index 60febc4ea44..065b3f381c9 100644
--- a/leim/quail/hebrew.el
+++ b/leim/quail/hebrew.el
@@ -1,6 +1,6 @@
 ;;; hebrew.el --- Quail package for inputting Hebrew characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/indian.el b/leim/quail/indian.el
index 8371047fcd0..973c5ff12bb 100644
--- a/leim/quail/indian.el
+++ b/leim/quail/indian.el
@@ -1,6 +1,7 @@
 ;;; indian.el --- Quail packages for inputting Indian
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: KAWABATA, Taichi <kawabata@m17n.org>
 
diff --git a/leim/quail/ipa.el b/leim/quail/ipa.el
index 56f356a4782..378646ae46b 100644
--- a/leim/quail/ipa.el
+++ b/leim/quail/ipa.el
@@ -1,6 +1,7 @@
 ;;; ipa.el --- Quail package for inputting IPA characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/japanese.el b/leim/quail/japanese.el
index ff133708153..d5ed027fff0 100644
--- a/leim/quail/japanese.el
+++ b/leim/quail/japanese.el
@@ -1,7 +1,9 @@
 ;;; japanese.el --- Quail package for inputting Japanese  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/lao.el b/leim/quail/lao.el
index d547ff2dbe9..bf9bdc21379 100644
--- a/leim/quail/lao.el
+++ b/leim/quail/lao.el
@@ -1,6 +1,7 @@
 ;;; lao.el --- Quail package for inputting Lao characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-alt.el b/leim/quail/latin-alt.el
index a764f416b43..54160808cc0 100644
--- a/leim/quail/latin-alt.el
+++ b/leim/quail/latin-alt.el
@@ -1,7 +1,8 @@
 ;;; latin-alt.el --- Quail package for inputting various European characters -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-ltx.el b/leim/quail/latin-ltx.el
index cb6052a7f05..e548a67a699 100644
--- a/leim/quail/latin-ltx.el
+++ b/leim/quail/latin-ltx.el
@@ -1,7 +1,8 @@
 ;;; latin-ltx.el --- Quail package for TeX-style input -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-post.el b/leim/quail/latin-post.el
index 090e2cc4330..5140348e7cc 100644
--- a/leim/quail/latin-post.el
+++ b/leim/quail/latin-post.el
@@ -1,7 +1,9 @@
 ;;; latin-post.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/latin-pre.el b/leim/quail/latin-pre.el
index e1102b5c475..76c2bc7937e 100644
--- a/leim/quail/latin-pre.el
+++ b/leim/quail/latin-pre.el
@@ -1,8 +1,10 @@
 ;;; latin-pre.el --- Quail packages for inputting various European characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/lrt.el b/leim/quail/lrt.el
index 9ce43294a16..5eeec0b8ab3 100644
--- a/leim/quail/lrt.el
+++ b/leim/quail/lrt.el
@@ -1,7 +1,9 @@
 ;;; lrt.el --- Quail package for inputting Lao characters by LRT method  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1998, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/py-punct.el b/leim/quail/py-punct.el
index 5fa4d9b9da0..4e271c9bf4d 100644
--- a/leim/quail/py-punct.el
+++ b/leim/quail/py-punct.el
@@ -1,7 +1,9 @@
 ;;; py-punct.el --- Quail packages for Chinese (pinyin + extra symbols)  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001, 2006 Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/pypunct-b5.el b/leim/quail/pypunct-b5.el
index a2e097902ef..9aa7257b824 100644
--- a/leim/quail/pypunct-b5.el
+++ b/leim/quail/pypunct-b5.el
@@ -1,6 +1,7 @@
 ;;; pypunct-b5.el --- Quail packages for Chinese (pinyin + extra symbols)
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/rfc1345.el b/leim/quail/rfc1345.el
index bf71aebcd52..7609a625d5c 100644
--- a/leim/quail/rfc1345.el
+++ b/leim/quail/rfc1345.el
diff --git a/leim/quail/sgml-input.el b/leim/quail/sgml-input.el
index 6bed808c83a..1130e5404c6 100644
--- a/leim/quail/sgml-input.el
+++ b/leim/quail/sgml-input.el
@@ -1,6 +1,7 @@
 ;;; sgml-input.el --- Quail method for Unicode entered as SGML entities -*- coding: utf-8 -*-
 
-;; Copyright (C) 2001, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/leim/quail/sisheng.el b/leim/quail/sisheng.el
index 48205fb57f8..0db36cb27e2 100644
--- a/leim/quail/sisheng.el
+++ b/leim/quail/sisheng.el
@@ -1,6 +1,6 @@
 ;;; sisheng.el --- sisheng input method for Chinese pinyin transliteration
 
-;; Copyright (C) 2004, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Werner LEMBERG <wl@gnu.org>
 
diff --git a/leim/quail/slovak.el b/leim/quail/slovak.el
index f8a05f657d5..9a32e52b710 100644
--- a/leim/quail/slovak.el
+++ b/leim/quail/slovak.el
@@ -1,6 +1,7 @@
 ;;; slovak.el --- Quail package for inputting Slovak  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1998, 2001, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Authors: Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>
 ;;	Milan Zamazal <pdm@zamazal.org>
diff --git a/leim/quail/symbol-ksc.el b/leim/quail/symbol-ksc.el
index 62a24408efb..ebaeff37162 100644
--- a/leim/quail/symbol-ksc.el
+++ b/leim/quail/symbol-ksc.el
@@ -1,7 +1,9 @@
 ;;; symbol-ksc.el --- Quail-package for Korean Symbol (KSC5601)
 
-;; Copyright (C) 1997, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/thai.el b/leim/quail/thai.el
index 6354c9dfde4..2d25a935425 100644
--- a/leim/quail/thai.el
+++ b/leim/quail/thai.el
@@ -1,7 +1,7 @@
 ;;; thai.el --- Quail package for inputting Thai characters
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/tibetan.el b/leim/quail/tibetan.el
index bad5dd58bcf..97bab8d93d3 100644
--- a/leim/quail/tibetan.el
+++ b/leim/quail/tibetan.el
@@ -1,7 +1,9 @@
 ;;; tibetan.el --- Quail package for inputting Tibetan characters
 
-;; Copyright (C) 1997, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/uni-input.el b/leim/quail/uni-input.el
index 1b4a3d3af1e..bf91d2ecff8 100644
--- a/leim/quail/uni-input.el
+++ b/leim/quail/uni-input.el
@@ -1,7 +1,8 @@
 ;;; uni-input.el --- Hex Unicode input method
 
-;; Copyright (C) 2001, 2003, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -107,13 +108,17 @@
 	      (let* ((n (string-to-number (apply 'string
 						 (cdr (nreverse events)))
 					  16))
-		     (c (decode-char 'ucs n))
-		     (status (make-vector 9 nil)))
+		     (c (decode-char 'ucs n)))
 		(if c
 		    (list c)
-		  (aset status 0 n)
-		  (string-to-list (ccl-execute-on-string
-				   'utf-8-ccl-encode status ""))))))
+		  ;; The intention of the following code is to insert
+		  ;; a correct UTF-8 sequence by raw bytes, but
+		  ;; currently it doesn't work.
+		  ;; (let ((status (make-vector 9 nil)))
+		  ;;   (aset status 0 n)
+		  ;;   (string-to-list (ccl-execute-on-string
+		  ;;                    'utf-8-ccl-encode status "")))
+		  (error "Character U+%04X is not yet supported" n)))))
 	(quail-delete-overlays)
 	(set-buffer-modified-p modified-p)
 	(run-hooks 'input-method-after-insert-chunk-hook)))))
diff --git a/leim/quail/viqr.el b/leim/quail/viqr.el
index bbe54a91f6d..bae7815fa80 100644
--- a/leim/quail/viqr.el
+++ b/leim/quail/viqr.el
@@ -1,6 +1,7 @@
 ;;; viqr.el --- Quail packages for inputting Vietnamese with VIQR system  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/leim/quail/vntelex.el b/leim/quail/vntelex.el
index 09d4daf2212..61cf7650304 100644
--- a/leim/quail/vntelex.el
+++ b/leim/quail/vntelex.el
@@ -1,6 +1,7 @@
 ;;; vntelex.el --- Quail package for Vietnamese by Telex method
 
-;; Copyright (C) 2001, 2002, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author:   Werner Lemberg <wl@gnu.org>
 ;; Keywords: multilingual, input method, Vietnamese
diff --git a/leim/quail/welsh.el b/leim/quail/welsh.el
index b5366c04dc5..af97d267057 100644
--- a/leim/quail/welsh.el
+++ b/leim/quail/welsh.el
@@ -1,6 +1,7 @@
 ;;; welsh.el --- Quail package for inputting Welsh characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fd0f61a6eff..0a1cdf1bb85 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -6198,7 +6198,7 @@
 
     Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995,
 	1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-	2006 Free Software Foundation, Inc.
+	2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 75ab5e192d1..bddabd364ad 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for lib-src subdirectory in GNU Emacs.
-# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2002, 2003, 2004,
-#               2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1985, 1987, 1988, 1993, 1994, 2001, 2002, 2003, 2004,
+#               2005, 2006, 2007  Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lib-src/b2m.pl b/lib-src/b2m.pl
index 225c272587f..39c5901348f 100644
--- a/lib-src/b2m.pl
+++ b/lib-src/b2m.pl
@@ -2,6 +2,9 @@
 
 # b2m.pl - Script to convert a Babyl file to an mbox file
 
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
+
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
diff --git a/lib-src/cvtmail.c b/lib-src/cvtmail.c
index c9f4f3713a7..f82f877923e 100644
--- a/lib-src/cvtmail.c
+++ b/lib-src/cvtmail.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/digest-doc.c b/lib-src/digest-doc.c
index 7787d422e39..16d386f5b4e 100644
--- a/lib-src/digest-doc.c
+++ b/lib-src/digest-doc.c
@@ -2,7 +2,7 @@
    standard output a file of nroff output containing the doc strings.
 
    Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c
index 1880f1655ee..b1348f8e841 100644
--- a/lib-src/ebrowse.c
+++ b/lib-src/ebrowse.c
@@ -1,7 +1,7 @@
 /* ebrowse.c --- parsing files for the ebrowse C++ browser
 
    Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
@@ -3691,7 +3691,7 @@ void
 version ()
 {
   printf ("ebrowse %s\n", VERSION);
-  puts ("Copyright (C) 1992-2006 Free Software Foundation, Inc.");
+  puts ("Copyright (C) 1992-2007 Free Software Foundation, Inc.");
   puts ("This program is distributed under the same terms as Emacs.");
   exit (EXIT_SUCCESS);
 }
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 4486c94660c..ae836e70371 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1,6 +1,6 @@
 /* Client process that communicates with GNU Emacs acting as server.
    Copyright (C) 1986, 1987, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/emacstool.c b/lib-src/emacstool.c
index 0843a3c5083..f04a8b3f545 100644
--- a/lib-src/emacstool.c
+++ b/lib-src/emacstool.c
@@ -1,6 +1,6 @@
 /*
-   Copyright (C) 1986, 1988, 1990, 1991, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1990, 1991, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/etags.c b/lib-src/etags.c
index 43ce2fdf3eb..a3ce46a888a 100644
--- a/lib-src/etags.c
+++ b/lib-src/etags.c
@@ -1,7 +1,7 @@
 /* Tags file maker to go with GNU Emacs           -*- coding: latin-1 -*-
    Copyright (C) 1984, 1987, 1988, 1989, 1993, 1994, 1995,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc. and Ken Arnold
+                 2005, 2006, 2007 Free Software Foundation, Inc. and Ken Arnold
 
  This file is not considered part of GNU Emacs.
 
@@ -841,7 +841,7 @@ static void
 print_version ()
 {
   printf ("%s (%s %s)\n", (CTAGS) ? "ctags" : "etags", EMACS_NAME, VERSION);
-  puts ("Copyright (C) 2006 Free Software Foundation, Inc. and Ken Arnold");
+  puts ("Copyright (C) 2007 Free Software Foundation, Inc. and Ken Arnold");
   puts ("This program is distributed under the same terms as Emacs");
 
   exit (EXIT_SUCCESS);
diff --git a/lib-src/fakemail.c b/lib-src/fakemail.c
index be9d6e09bae..e35c0f8a072 100644
--- a/lib-src/fakemail.c
+++ b/lib-src/fakemail.c
@@ -1,6 +1,6 @@
 /* sendmail-like interface to /bin/mail for system V,
-   Copyright (C) 1985, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/getopt.c b/lib-src/getopt.c
index a0698bba77a..b6d6b881de7 100644
--- a/lib-src/getopt.c
+++ b/lib-src/getopt.c
@@ -4,7 +4,7 @@
    before changing it!
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994,
                  1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-	         2004, 2005, 2006 Free Software Foundation, Inc.
+	         2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt1.c b/lib-src/getopt1.c
index 48d263e922a..c2bec4f8e9a 100644
--- a/lib-src/getopt1.c
+++ b/lib-src/getopt1.c
@@ -1,6 +1,6 @@
 /* getopt_long and getopt_long_only entry points for GNU getopt.
    Copyright (C) 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997,
-                 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 1998, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_.h b/lib-src/getopt_.h
index e17da9e243c..377c4837548 100644
--- a/lib-src/getopt_.h
+++ b/lib-src/getopt_.h
@@ -1,6 +1,6 @@
 /* Declarations for getopt.
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
-                 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/getopt_int.h b/lib-src/getopt_int.h
index f20d417b11f..25df3bbcfdc 100644
--- a/lib-src/getopt_int.h
+++ b/lib-src/getopt_int.h
@@ -1,6 +1,6 @@
 /* Internal declarations for getopt.
    Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 1999,
-                 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    This program is free software; you can redistribute it and/or modify
diff --git a/lib-src/gettext.h b/lib-src/gettext.h
index eb1976b6588..ed329003843 100644
--- a/lib-src/gettext.h
+++ b/lib-src/gettext.h
@@ -1,6 +1,6 @@
 /* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/lib-src/grep-changelog b/lib-src/grep-changelog
index 8c19486ea2e..d2e9ecfd7ee 100755
--- a/lib-src/grep-changelog
+++ b/lib-src/grep-changelog
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-#               2005, 2006 Free Software Foundation, Inc.
+#               2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/hexl.c b/lib-src/hexl.c
index 62fdd52b5a1..7cabdc95a66 100644
--- a/lib-src/hexl.c
+++ b/lib-src/hexl.c
@@ -1,6 +1,6 @@
 /* Convert files for Emacs Hexl mode.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is not considered part of GNU Emacs.
 
diff --git a/lib-src/make-docfile.c b/lib-src/make-docfile.c
index bfdb206ad97..d76bdd527cf 100644
--- a/lib-src/make-docfile.c
+++ b/lib-src/make-docfile.c
@@ -1,6 +1,6 @@
 /* Generate doc-string file for GNU Emacs from source files.
    Copyright (C) 1985, 1986, 1992, 1993, 1994, 1997, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/makefile.w32-in b/lib-src/makefile.w32-in
index bc998e710d7..3cb0c264a23 100644
--- a/lib-src/makefile.w32-in
+++ b/lib-src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006 Free Software Foundation, Inc.
+#                2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -24,7 +24,7 @@ ALL = make-docfile hexl ctags etags movemail ebrowse sorted-doc digest-doc emacs
 
 .PHONY: $(ALL)
 
-VERSION		= 22.0.92
+VERSION		= 22.0.93
 
 LOCAL_FLAGS	= -DWINDOWSNT -DDOS_NT -DSTDC_HEADERS=1 -DNO_LDAV=1 \
 		  -DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../nt/inc \
diff --git a/lib-src/movemail.c b/lib-src/movemail.c
index 1f73ee88ba8..84d4f949b2f 100644
--- a/lib-src/movemail.c
+++ b/lib-src/movemail.c
@@ -1,7 +1,7 @@
 /* movemail foo bar -- move file foo to file bar,
    locking file foo the way /bin/mail respects.
-   Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 1993, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.c b/lib-src/ntlib.c
index 94110e4306c..5f6c12abceb 100644
--- a/lib-src/ntlib.c
+++ b/lib-src/ntlib.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/ntlib.h b/lib-src/ntlib.h
index 96862aa334b..a5655519fe1 100644
--- a/lib-src/ntlib.h
+++ b/lib-src/ntlib.h
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs support programs on NT.
    Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/pop.c b/lib-src/pop.c
index 5dcbf2d2483..a829607faa5 100644
--- a/lib-src/pop.c
+++ b/lib-src/pop.c
@@ -1,6 +1,6 @@
 /* pop.c: client routines for talking to a POP3-protocol post-office server
-   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/pop.h b/lib-src/pop.h
index 102fef6327b..664fb26f7db 100644
--- a/lib-src/pop.h
+++ b/lib-src/pop.h
@@ -1,6 +1,6 @@
 /* pop.h: Header file for the "pop.c" client POP3 protocol.
-   Copyright (C) 1991, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Written by Jonathan Kamens, jik@security.ov.com.
 
 This file is part of GNU Emacs.
diff --git a/lib-src/profile.c b/lib-src/profile.c
index 399752b5808..1174666da78 100644
--- a/lib-src/profile.c
+++ b/lib-src/profile.c
@@ -1,6 +1,6 @@
 /* profile.c --- generate periodic events for profiling of Emacs Lisp code.
-   Copyright (C) 1992, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
  Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 
diff --git a/lib-src/rcs-checkin b/lib-src/rcs-checkin
index f805705ae6a..1ec783934e6 100755
--- a/lib-src/rcs-checkin
+++ b/lib-src/rcs-checkin
@@ -3,7 +3,7 @@
 # This script accepts any number of file arguments and checks them into RCS.
 
 # Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-#               2005, 2006 Free Software Foundation, Inc.
+#               2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lib-src/rcs2log b/lib-src/rcs2log
index 795c70ecd85..371a52de66c 100755
--- a/lib-src/rcs2log
+++ b/lib-src/rcs2log
@@ -55,7 +55,7 @@ Report bugs to <bug-gnu-emacs@gnu.org>.'
 Id='$Id$'
 
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-#               2004, 2005, 2006 Free Software Foundation, Inc.
+#               2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -72,7 +72,7 @@ Id='$Id$'
 # Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-Copyright='Copyright (C) 2006 Free Software Foundation, Inc.
+Copyright='Copyright (C) 2007 Free Software Foundation, Inc.
 This program comes with NO WARRANTY, to the extent permitted by law.
 You may redistribute copies of this program
 under the terms of the GNU General Public License.
diff --git a/lib-src/sorted-doc.c b/lib-src/sorted-doc.c
index a8b2d441f9a..28f736ab843 100644
--- a/lib-src/sorted-doc.c
+++ b/lib-src/sorted-doc.c
@@ -2,7 +2,7 @@
    standard output a file of texinfo input containing the doc strings.
 
    Copyright (C) 1989, 1992, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/test-distrib.c b/lib-src/test-distrib.c
index 0fdb29b1f39..cd504c8c538 100644
--- a/lib-src/test-distrib.c
+++ b/lib-src/test-distrib.c
@@ -1,7 +1,7 @@
 /* test-distrib.c --- testing distribution of nonprinting chars
 
    Copyright (C) 1987, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
    This file is part of GNU Emacs.
 
diff --git a/lib-src/update-game-score.c b/lib-src/update-game-score.c
index 56d873044e7..9f1c011ce79 100644
--- a/lib-src/update-game-score.c
+++ b/lib-src/update-game-score.c
@@ -1,5 +1,5 @@
 /* update-game-score.c --- Update a score file
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/lib-src/vcdiff b/lib-src/vcdiff
index 2cba89df421..21c6e70e9d8 100755
--- a/lib-src/vcdiff
+++ b/lib-src/vcdiff
@@ -4,7 +4,7 @@
 # This version is more compatible with rcsdiff(1).
 #
 # Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-#               2005, 2006 Free Software Foundation, Inc.
+#               2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f24de58fbb7..7d30691f1a6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,367 @@
+2007-01-28  Kim F. Storm  <storm@cua.dk>
+
+	* emulation/cua-base.el (cua-global-keymap, cua--region-keymap):
+	Declare earlier to avoid byte compiler warnings.
+
+2007-01-28  Markus Triska  <markus.triska@gmx.at>
+
+	* speedbar.el (speedbar-make-specialized-keymap): Doc fix.
+
+2007-01-28  Chong Yidong  <cyd@stupidchicken.com>
+
+	* play/gamegrid.el (gamegrid-kill-timer): Cancel timer directly.
+	(gamegrid-add-score-with-update-game-score-1): Allow local quits
+	when calling update-game-score program.  Remove unnecessary
+	save-excursion.
+
+	* play/tetris.el (tetris-new-shape): Stop drawing if game is over.
+
+2007-01-28  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-breakpoint-regexp): Declare earlier to
+	avoid compiler warning.
+	(gdb-var-update-handler-1): Consider that the MI field `in_scope'
+	might have values other than "true" or "false".
+
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+	* textmodes/fill.el (fill-paragraph-function): Doc fix.
+	(fill-paragraph): Bind fill-paragraph-function to t to avoid recursion.
+
+	* emacs-lisp/pp.el (pp-eval-last-sexp): Don't eval here.
+
+	* image.el (image-type-header-regexps): Make GIF regex more specific.
+
+	* tutorial.el (tutorial--default-keys): Check M-DEL, not `M-backspace'.
+	Don't check `backspace'.
+	(tutorial--find-changed-keys): Look up bindings in a temp buffer
+	in Fundamental mode.
+
+	* startup.el (fancy-splash-text, normal-splash-screen):
+	Mention C-g.
+
+	* simple.el (eval-expression): Don't use eval-last-sexp-print-value
+	when inserting in buffer.
+
+	* vc-arch.el (vc-arch-file-id): Move with-current-buffer
+	inside the if.
+
+2007-01-27  Richard Stallman  <rms@gnu.org>
+
+	* obsolete/awk-mode.el (awk-font-lock-keywords): Add "do".
+
+2007-01-27  Guanpeng Xu  <herberteuler@hotmail.com>
+
+	* add-log.el (add-log-current-defun): Skip the semicolon ``;'' for
+        enum/union/struct/class definition.
+	Revert change to call `forward-sexp' multiple times.
+
+2007-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* files.el (hack-local-variables-confirm): Don't keep trying to
+	read an event from an empty kbd macro.
+
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* server.el (server-start): Mention LEAVE-DEAD arg in the doc string.
+
+2007-01-27  Ben North  <ben@redfrontdoor.org>
+
+	* outline.el (outline-promote, outline-demote): Doc fix.  Rename
+	the arg CHILDREN -> WHICH.
+
+2007-01-27  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Set
+	default-directory to a sane value when calling start-process.
+
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* ls-lisp.el (ls-lisp-use-localized-time-format): New defcustom.
+	(ls-lisp-format-time-list): Doc fix.  Mention
+	ls-lisp-use-localized-time-format.
+	(ls-lisp-format-time): Use ls-lisp-format-time-list if
+	ls-lisp-use-localized-time-format is non-nil, even if a valid
+	locale is defined.
+
+2007-01-27  Juanma Barranquero  <lekktu@gmail.com>
+
+	* jka-compr.el (jka-compr-shell): Doc fix.
+
+	* jka-cmpr-hook.el (jka-compr-compression-info-list): Doc fix.
+
+2007-01-26  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-print.ps: Fix background height.
+	(ps-print-version): New version 6.7.2.
+
+2007-01-26  Eli Zaretskii  <eliz@gnu.org>
+
+	* makefile.w32-in (finder-data, custom-deps): Depend on
+	$(lisp)/loaddefs.el.
+
+2007-01-24  Dan Nicolaescu  <dann@ics.uci.edu>
+
+	* Makefile.in (custom-deps, finder-data): Add dependency to loaddefs.el.
+
+2007-01-24  Miles Bader  <miles@gnu.org>
+
+	* emacs-lisp/bytecomp.el (byte-compile-output-file-form)
+	(byte-compile-output-docform): Bind `print-circle' to t.
+
+2007-01-24  Kenichi Handa  <handa@m17n.org>
+
+	* international/ja-dic-cnv.el (skkdic-convert): Insert a related
+	file name of the original SKK dictionary file.
+
+2007-01-24  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-initial-position): New variable.
+	(ido-read-internal): Set it if default item is specified.
+	(ido-minibuffer-setup): Position cursor accordingly if set.
+	(ido-edit-input): C-e moves to end of input if not already there.
+	(ido-magic-backward-char): C-b does like M-b if prev char is /.
+	Don't switch to buffer mode if repeating C-b at start of input.
+	(ido-toggle-ignore): C-a only toggles ignore at start or end of
+	input; else it moves to start of input.
+	(ido-kill-buffer-at-head, ido-delete-file-at-head): If cursor is
+	not at end of input, delete rest of input, rather than normal op.
+
+2007-01-23  Michael Kifer  <kifer@cs.stonybrook.edu>
+
+	* viper-keym.el (viper-insert-basic-map): Delete binding for S-TAB.
+
+	* ediff-util.el (ediff-clone-buffer-for-region-comparison): Change text
+	of message.  Activate mark.
+	(ediff-activate-mark): Set transient-mark-mode to t.
+
+	* ediff.el (ediff-regions-wordwise, ediff-regions-linewise): Doc fix.
+
+2007-01-23  Martin Rudalics  <rudalics@gmx.at>
+
+	* help-fns.el (describe-variable): Don't suppress display of
+	buffer local value when the value is "large".
+
+2007-01-22  Kim F. Storm  <storm@cua.dk>
+
+	* ido.el (ido-active): Add XEmacs test from ido-minibuffer-setup.
+	(ido-initiate-auto-merge, ido-exhibit, ido-minibuffer-setup)
+	(ido-tidy): Use ido-active.
+
+2007-01-22  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+	* hexl.el (hexl-mode-exit): Add missing quote.
+
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-keyboard-modifier-mask-alist): New constant.
+	(mac-ae-keyboard-modifiers): New function.
+	(mac-handle-toolbar-switch-mode): Use it.
+	(mac-dnd-handle-drag-n-drop-event): Likewise.  Set action to `copy'
+	if keyboard modifiers on drop contain option key.
+	(mac-dnd-drop-data): Add optional argument `action'.
+	(special-event-map): Remove binding for M-drag-n-drop.
+
+2007-01-21  Guanpeng Xu  <herberteuler@hotmail.com>
+
+	* add-log.el (add-log-current-defun): Use CC Mode functions to
+	find the beginning and end of a defun.
+
+2007-01-21  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-var-create-regexp)
+	(gdb-var-create-handler): Handle value field in GDB output of
+	-var-create.
+	(gdb-max-frames): New variable.
+	(gdb-stack-buffer, gdb-frames-select): Use it.
+	(gdb-info-stack-custom): Help user customize gdb-max-frames,
+	if necessary.
+	(gdb-get-frame-number): Simplify.
+
+2007-01-21  Glenn Morris  <rgm@gnu.org>
+
+	* net/tramp.el (tramp-perl-encode, tramp-perl-decode):
+	Update copyrights.
+
+2007-01-21  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-cmds.el (c-where-wrt-brace-construct): Correct the
+	handling of K&R stuff.
+
+2007-01-21  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
+
+	* textmodes/bibtex.el (bibtex-files): Fix customization type.
+
+2007-01-21  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
+
+	* ps-print.el: Handle frame parameters (background and/or foreground
+	colors) changing dynamically.  Reported by Leo <sdl.web@gmail.com>.
+	(ps-print-version): New version 6.7.1.
+	(ps-x-frame-property, ps-e-frame-parameter): New aliases.
+	(ps-frame-parameter): New fun.
+	(ps-default-fg, ps-default-bg): New default value ('frame-parameter).
+	Fix doc and customization.
+	(ps-begin-job): Get frame parameters (background and/or foreground
+	colors).
+	(ps-do-despool): Ensure ps-printer-name has a valid value.
+
+2007-01-21  Nick Roberts  <nickrob@snap.net.nz>
+
+	* progmodes/gdb-ui.el (gdb-debug-log): Rename from gdb-debug-ring.
+	(gdb-debug-log-max): Rename from gdb-debug-ring-max.
+	(gud-gdba-marker-filter): Make a value of nil for gdb-debug-ring-max
+	mean unlimited.
+
+2007-01-20  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-engine.el (c-in-knr-argdecl): Reformulate to do
+	much more rigorous analysis of putative K&R regions.
+
+2007-01-20  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-defs.el (c-go-list-forward, c-go-list-backward):
+	New functions.
+
+2007-01-20  Alan Mackenzie  <acm@muc.de>
+
+	* progmodes/cc-align.el, progmodes/cc-cmds.el,
+	* progmodes/cc-defs.el, progmodes/cc-engine.el,
+	* progmodes/cc-langs.el, progmodes/cc-styles.el,
+	* progmodes/cc-vars.el: Add my name.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* files.el (find-alternate-file): Revert query message to Emacs 21
+	version.
+
+2007-01-20  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
+
+	* progmodes/cperl-mode.el (cperl-electric-keywords): Document in
+	the doc string how to use personal abbrevs without electric
+	keywords.
+
+2007-01-20  Alin C. Soare  <alinsoar@voila.fr>  (tiny change)
+
+	* lisp/emacs-lisp/lisp-mode.el (last-sexp-toggle-display):
+	Fixed cursor position when toggle abbreviated display.
+
+2007-01-20  Nick Roberts  <nickrob@snap.net.nz>
+
+	* t-mouse.el: Update copyright following assignment by
+	Alessandro Rubini.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* type-break.el (type-break-demo-hanoi, type-break-demo-life)
+	(type-break-demo-boring): Call read-event instead of read-char.
+
+2007-01-19  Daniel Pfeiffer  <occitan@esperanto.org>  (small change)
+
+	* progmodes/compile.el: Add handling for makepplog.
+
+2007-01-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* textmodes/ispell.el (ispell-change-dictionary): Ensure that
+	aspell dictionaries are initialized when called non-interactively.
+
+2007-01-19  Chong Yidong  <cyd@stupidchicken.com>
+
+	* progmodes/compile.el (compilation-loop): New arg limit.
+	Handle case where the first error is at point-min.
+	(compilation-next-error): New arg to compilation-loop call.
+
+2007-01-18  Bruno Haible  <bruno@clisp.org>  (tiny change)
+
+	* info.el (Info-default-dirs): Change default info dir to
+	share/info.
+
+	* paths.el (Info-default-directory-list): Ditto.
+
+2007-01-18  Chris Moore  <christopher.ian.moore@gmail.com>  (tiny change)
+
+	* hexl.el (hexl-before-revert-hook): New function.
+	(hexl-mode): Use it.
+	(hexl-after-revert-hook): Just call hexl-mode.
+	(hexl-mode-exit): Remove before-revert-hook.
+
+2007-01-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* isearch.el (isearch-no-upper-case-p): Look for [:upper:] as well.
+
+2007-01-16  Martin Rudalics  <rudalics@gmx.at>
+
+	* textmodes/ispell.el (ispell-dictionary-alist-3): Replace "---"
+	by "-" in francais7 otherchars entry.
+	(ispell-dictionary-alist-5): Replace "." by "[.]" for polish
+	otherchars entry.
+
+2007-01-15  Karl Fogel  <kfogel@red-bean.com>
+
+	* bookmark.el (bookmark-buffer-file-name): Abbreviate the bookmark
+	path.  Rewrite function in `cond' style for readability.
+
+	Suggested by: Stephen Eglen <S.J.Eglen{_AT_}damtp.cam.ac.uk>.
+	(The path shortening, that is, not the rearrarangement.)
+
+2007-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* term/mac-win.el (mac-ae-quit-application): New function.
+	(mac-apple-event-map): Bind "quit application" Apple event to it.
+
+2007-01-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* vc-svn.el (vc-svn-parse-status): Trust the filename argument more
+	than the program's output.
+
+2007-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* kmacro.el (kmacro-insert-counter, kmacro-set-counter)
+	(kmacro-start-macro-or-insert-counter)
+	(kmacro-step-edit-prefix-commands): Fix typos in docstrings.
+	(kmacro-call-ring-2nd, kmacro-call-ring-2nd-repeat): Doc fixes.
+
+	* longlines.el (longlines-show-hard-newlines):
+	* ruler-mode.el (ruler-mode-ruler):
+	* emulation/keypad.el (keypad-setup):
+	* progmodes/antlr-mode.el (antlr-indent-at-bol-alist):
+	Fix typo in docstring.
+
+2007-01-13  Mathias Dahl  <mathias.dahl@gmail.com>
+
+	* tumme.el (tumme-cmd-rotate-original-options): Add -outfile option.
+	Remove redirect character ">".
+
+2007-01-13  Juanma Barranquero  <lekktu@gmail.com>
+
+	* replace.el (perform-replace): Remove leftover code.
+
+2007-01-12  Richard Stallman  <rms@gnu.org>
+
+	* replace.el (perform-replace): Don't clear NODENT when computing
+	the replacement string.
+
+2007-01-11  Michael Albinus  <michael.albinus@gmx.de>
+
+	* net/tramp.el (tramp-handle-file-local-copy):
+	Set `enable-multibyte-characters' to nil.  Reported by Chris Moore
+	<christopher.ian.moore@gmail.com>.
+
+2007-01-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* diff-mode.el (diff-sanity-check-context-hunk-half)
+	(diff-sanity-check-hunk): New functions.
+	(diff-find-source-location): Use'em to check the hunks are well-formed.
+
+	* hexl.el (hexlify-buffer, dehexlify-buffer): Don't complain and don't
+	activate undo when undo is not active.
+	Reported by Chris Moore <christopher.ian.moore@gmail.com>.
+
+2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* ffap.el (ffap-next-regexp, ffap-machine-p, ffap-newsgroup-regexp)
+	(ffap-newsgroup-p, ffap-alist, ffap-string-at-point-mode-alist)
+	(ffap-url-at-point): Use char-classes rather than "a-z".
+
 2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* ediff-init.el (ediff-autostore-merges):
@@ -398,7 +762,7 @@
 	(image-type-from-buffer): Handle new format.  New arg INCLUDE-MAYBES.
 	(image-type-from-file-header): Pass t for INCLUDE-MAYBES.
 
-2006-12-26  Guanpeng Xu  <herberteuler@hotmail.com>  (tiny change)
+2006-12-26  Guanpeng Xu  <herberteuler@hotmail.com>
 
 	* add-log.el (add-log-current-defun): Call `forward-sexp'
 	multiple times to pick a member function name defined as
@@ -1038,7 +1402,7 @@
 	* ps-mule.el: Eliminate Emacs 20 compatibility.
 
 	* ps-print.el: Eliminate Emacs 20 & 21 compatibility.
-	(ps-print-version): New Version 6.7.
+	(ps-print-version): New version 6.7.
 	(ps-print-quote): Replace '?\ ' by '?\s'.
 
 2006-11-30  Juanma Barranquero  <lekktu@gmail.com>
@@ -5148,7 +5512,7 @@
 	* textmodes/table.el: Add move-beginning-of-line and
 	move-end-of-line to Point Motion Only Group.
 
-2006-07-22  Eric Hanchrow  <offby1@blarg.net>
+2006-07-22  Eric Hanchrow  <offby1@blarg.net>  (tiny change)
 
 	* progmodes/delphi.el (delphi-fill-comment): Use save-restriction.
 
@@ -7222,8 +7586,8 @@
 2006-05-11  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* files.el, newcomment.el, outline.el, simple.el,
-	emacs-lisp/bytecomp.el, progmodes/cc-compat.el,
-	progmodes/cc-vars.el, progmodes/compile.el:
+	* emacs-lisp/bytecomp.el, progmodes/cc-compat.el,
+	* progmodes/cc-vars.el, progmodes/compile.el:
 	Move `safe-local-variable' declarations to the respective files.
 
 	* help-fns.el (describe-variable): Don't print safe-var if it is
@@ -11147,7 +11511,7 @@
 	Sync with Tramp 2.0.52.
 
 	* net/tramp.el, net/tramp-ftp.el, net/tramp-util.el,
-	net/tramp-vc.el: Add code for unloading Tramp.  See comment before
+	* net/tramp-vc.el: Add code for unloading Tramp.  See comment before
 	`tramp-unload-tramp' for checklist.
 
 	* net/tramp.el: Require `timer-funcs' instead of `timer' if in
@@ -30717,7 +31081,7 @@ See ChangeLog.11 for earlier changes.
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/ChangeLog.1 b/lisp/ChangeLog.1
index 7dc41a63526..76f9040c989 100644
--- a/lisp/ChangeLog.1
+++ b/lisp/ChangeLog.1
@@ -3246,7 +3246,7 @@
 		Set current buffer variables from defaults
 		in case user's init file has changed them.
 
-    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.10 b/lisp/ChangeLog.10
index b626a61c8d3..02affab175f 100644
--- a/lisp/ChangeLog.10
+++ b/lisp/ChangeLog.10
@@ -2061,7 +2061,7 @@
 	(face-spec-set): Set face-modified prop to nil
 	when we change the new-frame defaults.
 
-	* cus-edit.el (custom-face-state-set): non-nil `face-modified'
+	* cus-edit.el (custom-face-state-set): Non-nil `face-modified'
 	means face was set outside of Custom.
 
 2003-05-28  Richard M. Stallman  <rms@gnu.org>
@@ -2170,7 +2170,7 @@
 	(gdb-display-source-buffer): Display assembler during execution,
 	when requested.
 	(gud-menu-map): Add a toggle button to menubar for gdb-many-windows.
-	(gdb-many-windows): Define explicitly as a function and a variable.
+	(gdb-many-windows): Define explicitly as a function and a variable
 	(formerly as a minor mode).  These need to be global so layout can
 	be reset from any buffer.
 	(gdb-assembler-mode): Keep fringe outside margin as the overlay
@@ -3330,8 +3330,8 @@
 	(ada-set-default-project-file): New parameter KEEP-EXISTING.
 	(ada-prj-find-prj-file): New parameter FILE.
 	(ada-parse-prj-file): Take into account the ADA_INCLUDE_PATH and
-	ADA_OBJECTS_PATH environment variables.  Minor reorganization of the
-	code.
+	ADA_OBJECTS_PATH environment variables.  Minor reorganization of
+	the code.
 	(ada-get-all-references): Add support for GNAT 3.16 cross-references.
 
 	* progmodes/ada-prj.el (ada-prj-add-keymap): Move to ada-mode.el
@@ -23533,7 +23533,7 @@ See ChangeLog.9 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.11 b/lisp/ChangeLog.11
index 4de116f8bf9..40482ce2f80 100644
--- a/lisp/ChangeLog.11
+++ b/lisp/ChangeLog.11
@@ -14336,7 +14336,7 @@ See ChangeLog.10 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+    Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2
index cc94f4ff64f..af450e18cd2 100644
--- a/lisp/ChangeLog.2
+++ b/lisp/ChangeLog.2
@@ -3994,7 +3994,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.3 b/lisp/ChangeLog.3
index 66bad2c8021..71ac61138da 100644
--- a/lisp/ChangeLog.3
+++ b/lisp/ChangeLog.3
@@ -12615,7 +12615,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.4 b/lisp/ChangeLog.4
index 30fa3124635..d71a9f5d2ba 100644
--- a/lisp/ChangeLog.4
+++ b/lisp/ChangeLog.4
@@ -8939,7 +8939,7 @@
 
 See ChangeLog.3 for earlier changes.
 
-    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5
index a070a2cf7a4..62352984ed1 100644
--- a/lisp/ChangeLog.5
+++ b/lisp/ChangeLog.5
@@ -9261,7 +9261,7 @@
 
 See ChangeLog.4 for earlier changes.
 
-    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6
index dfa9dfae61b..0d02bf4739b 100644
--- a/lisp/ChangeLog.6
+++ b/lisp/ChangeLog.6
@@ -8021,7 +8021,7 @@ Wed Jul 26 15:40:00 Michael Kifer  (kifer@cs.sunysb.edu)
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.7 b/lisp/ChangeLog.7
index fa07ccc187b..461ecbd7b72 100644
--- a/lisp/ChangeLog.7
+++ b/lisp/ChangeLog.7
@@ -23139,7 +23139,7 @@
 
 See ChangeLog.6 for earlier changes.
 
-    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.8 b/lisp/ChangeLog.8
index 7aaaed4196f..be532b10907 100644
--- a/lisp/ChangeLog.8
+++ b/lisp/ChangeLog.8
@@ -10012,7 +10012,7 @@
 
 See ChangeLog.7 for earlier changes.
 
-    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/ChangeLog.9 b/lisp/ChangeLog.9
index 78c0734ddd9..3d2b41b433c 100644
--- a/lisp/ChangeLog.9
+++ b/lisp/ChangeLog.9
@@ -20695,7 +20695,7 @@ See ChangeLog.8 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+    Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/Makefile.in b/lisp/Makefile.in
index f6bb1c8a3ef..3e155bf2b89 100644
--- a/lisp/Makefile.in
+++ b/lisp/Makefile.in
@@ -1,6 +1,6 @@
 # Maintenance productions for the Lisp directory
 # Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+#   2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -87,12 +87,12 @@ doit:
 
 $(lisp)/cus-load.el:
 	touch $@
-custom-deps: $(lisp)/cus-load.el doit
+custom-deps: $(lisp)/loaddefs.el $(lisp)/cus-load.el doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(EMACS) $(EMACSOPT) -l cus-dep --eval '(setq generated-custom-dependencies-file "$(lisp)/cus-load.el")' -f custom-make-dependencies $$wins
 
-finder-data: doit
+finder-data: $(lisp)/loaddefs.el doit
 	wd=$(lisp); $(setwins_almost); \
 	echo Directories: $$wins; \
 	$(EMACS) $(EMACSOPT) -l finder --eval '(setq generated-finder-keywords-file "$(lisp)/finder-inf.el")' -f finder-compile-keywords-make-dist $$wins
@@ -242,7 +242,7 @@ mh-autoloads: $(lisp)/mh-e/mh-loaddefs.el
 $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 	echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
 	echo "" >> $@
-	echo ";; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc." >> $@
+	echo ";; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc." >> $@
 	echo ";; Author: Bill Wohler <wohler@newt.com>" >> $@
 	echo ";; Keywords: mail" >> $@
 	echo ";;; Commentary:" >> $@
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index b0ceaa5522d..1363ccee561 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -1,7 +1,7 @@
 ;;; abbrev.el --- abbrev mode commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
diff --git a/lisp/abbrevlist.el b/lisp/abbrevlist.el
index 065d4eacabc..faaceaf3113 100644
--- a/lisp/abbrevlist.el
+++ b/lisp/abbrevlist.el
@@ -1,7 +1,7 @@
 ;;; abbrevlist.el --- list one abbrev table alphabetically ordered
 
 ;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Suggested by a previous version by Gildea.
 
 ;; Maintainer: FSF
diff --git a/lisp/add-log.el b/lisp/add-log.el
index 2ecb274b4de..08ce78d371d 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -1,7 +1,7 @@
 ;;; add-log.el --- change log maintenance commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tools
@@ -813,51 +813,60 @@ Has a preference of looking backwards."
 						 (progn (forward-sexp 1)
 							(point))))
 		((memq major-mode add-log-c-like-modes)
-		 (beginning-of-line)
-		 ;; See if we are in the beginning part of a function,
-		 ;; before the open brace.  If so, advance forward.
-		 (while (not (looking-at "{\\|\\(\\s *$\\)"))
-		   (forward-line 1))
-		 (or (eobp)
-		     (forward-char 1))
-		 (let (maybe-beg)
-		   ;; Try to find the containing defun.
-		   (beginning-of-defun)
-		   (end-of-defun)
-		   ;; If the defun we found ends before the desired position,
-		   ;; see if there's a DEFUN construct
-		   ;; between that end and the desired position.
-		   (when (save-excursion
-			   (and (> location (point))
-				(re-search-forward "^DEFUN"
-						   (save-excursion
-						     (goto-char location)
-						     (line-end-position))
-						   t)
-				(re-search-forward "^{" nil t)
-				(setq maybe-beg (point))))
-		     ;; If so, go to the end of that instead.
-		     (goto-char maybe-beg)
-		     (end-of-defun)))
-		 ;; If the desired position is within the defun we found,
-		 ;; find the function name.
-		 (when (< location (point))
-		   ;; Move back over function body.
-		   (backward-sexp 1)
-		   (let (beg)
-		     ;; Skip back over typedefs and arglist.
-		     ;; Stop at the function definition itself
-		     ;; or at the line that follows end of function doc string.
-		     (forward-line -1)
-		     (while (and (not (bobp))
-				 (looking-at "[ \t\n]")
-				 (not (looking-back "[*]/)\n" (- (point) 4))))
-		       (forward-line -1))
-		     ;; If we found a doc string, this must be the DEFUN macro
-		     ;; used in Emacs.  Move back to the DEFUN line.
-		     (when (looking-back "[*]/)\n" (- (point) 4))
-		       (backward-sexp 1)
-		       (beginning-of-line))
+		 ;; See whether the point is inside a defun.
+		 (let (having-previous-defun
+		       having-next-defun
+		       previous-defun-end
+		       next-defun-beginning)
+		     
+		   (save-excursion
+		     (setq having-previous-defun
+			   (c-beginning-of-defun))
+		     (c-end-of-defun)
+		     ;; `c-end-of-defun' moves point to the line after
+		     ;; the function close, but the position we prefer
+		     ;; here is the position after the final }.
+		     (backward-sexp 1)
+		     (forward-sexp 1)
+                     ;; Skip the semicolon ``;'' for
+		     ;; enum/union/struct/class definition.
+		     (if (= (char-after (point)) ?\;)
+			 (forward-char 1))
+		     (setq previous-defun-end (point)))
+
+		   (save-excursion
+		     (setq having-next-defun
+			   (c-end-of-defun))
+		     (c-beginning-of-defun)
+		     (setq next-defun-beginning (point)))
+
+		   (if (and having-next-defun
+			    (< location next-defun-beginning))
+		       (skip-syntax-forward " "))
+		   (if (and having-previous-defun
+			    (> location previous-defun-end))
+		       (skip-syntax-backward " "))
+		   (unless (or
+			    ;; When there is no previous defun, the
+			    ;; point is not in a defun if it is not at
+			    ;; the beginning of the next defun.
+			    (and (not having-previous-defun)
+				 (not (= (point)
+					 next-defun-beginning)))
+			    ;; When there is no next defun, the point
+			    ;; is not in a defun if it is not at the
+			    ;; end of the previous defun.
+			    (and (not having-next-defun)
+				 (not (= (point)
+					 previous-defun-end)))
+			    ;; If the point is between two defuns, it
+			    ;; is not in a defun.
+			    (and (> (point) previous-defun-end)
+				 (< (point) next-defun-beginning)))
+		     ;; If the point is already at the beginning of a
+		     ;; defun, there is no need to move point again.
+		     (if (not (= (point) next-defun-beginning))
+			 (c-beginning-of-defun))
 		     ;; Is this a DEFUN construct?  And is LOCATION in it?
 		     (if (and (looking-at "DEFUN\\b")
 			      (>= location (point)))
@@ -879,82 +888,72 @@ Has a preference of looking backwards."
 			   ;; Objective-C
 			   (change-log-get-method-definition)
 			 ;; Ordinary C function syntax.
-			 (setq beg (point))
-			 (if (and
-			      ;; Protect against "Unbalanced parens" error.
-			      (condition-case nil
-				  (progn
-				    (down-list 1) ; into arglist
-				    (backward-up-list 1)
-				    (skip-chars-backward " \t")
-				    t)
-				(error nil))
-			      ;; Verify initial pos was after
-			      ;; real start of function.
-			      (save-excursion
-				(goto-char beg)
-				;; For this purpose, include the line
-				;; that has the decl keywords.  This
-				;; may also include some of the
-				;; comments before the function.
-				(while (and (not (bobp))
-					    (save-excursion
-					      (forward-line -1)
-					      (looking-at "[^\n\f]")))
-				  (forward-line -1))
-				(>= location (point)))
-			      ;; Consistency check: going down and up
-			      ;; shouldn't take us back before BEG.
-			      (> (point) beg))
-			     (let (end middle)
-			       ;; Don't include any final whitespace
-			       ;; in the name we use.
-			       (skip-chars-backward " \t\n")
-			       (setq end (point))
-			       (backward-sexp 1)
-			       ;; Now find the right beginning of the name.
-			       ;; Include certain keywords if they
-			       ;; precede the name.
-			       (setq middle (point))
-			       ;; Single (forward-sexp -1) invocation is
-			       ;; not enough for C++ member function defined 
-			       ;; as part of nested class and/or namespace 
-			       ;; like:
-			       ;;
-			       ;;   void 
-			       ;;   foo::bar::baz::bazz ()
-			       ;;   { ...
-			       ;; 
-			       ;; Here we have to move the point to 
-			       ;; the beginning of foo, not bazz.
-			       (while (not (looking-back "\\(^\\|[ \t]\\)"))
-				 (forward-sexp -1))
-			       ;; Is this C++ method?
-			       (when (and (< 2 middle)
-					  (string= (buffer-substring (- middle 2)
-								     middle)
-						   "::"))
-				 ;; Include "classname::".
-				 (setq middle (point)))
-			       ;; Ignore these subparts of a class decl
-			       ;; and move back to the class name itself.
-			       (while (looking-at "public \\|private ")
-				 (skip-chars-backward " \t:")
+			 (let ((beg (point)))
+			   (if (and
+				;; Protect against "Unbalanced parens" error.
+				(condition-case nil
+				    (progn
+				      (down-list 1) ; into arglist
+				      (backward-up-list 1)
+				      (skip-chars-backward " \t")
+				      t)
+				  (error nil))
+				;; Verify initial pos was after
+				;; real start of function.
+				(save-excursion
+				  (goto-char beg)
+				  ;; For this purpose, include the line
+				  ;; that has the decl keywords.  This
+				  ;; may also include some of the
+				  ;; comments before the function.
+				  (while (and (not (bobp))
+					      (save-excursion
+						(forward-line -1)
+						(looking-at "[^\n\f]")))
+				    (forward-line -1))
+				  (>= location (point)))
+				;; Consistency check: going down and up
+				;; shouldn't take us back before BEG.
+				(> (point) beg))
+			       (let (end middle)
+				 ;; Don't include any final whitespace
+				 ;; in the name we use.
+				 (skip-chars-backward " \t\n")
 				 (setq end (point))
 				 (backward-sexp 1)
+				 ;; Now find the right beginning of the name.
+				 ;; Include certain keywords if they
+				 ;; precede the name.
 				 (setq middle (point))
-				 (forward-word -1))
-			       (and (bolp)
-				    (looking-at
-				     "enum \\|struct \\|union \\|class ")
-				    (setq middle (point)))
-			       (goto-char end)
-			       (when (eq (preceding-char) ?=)
-				 (forward-char -1)
-				 (skip-chars-backward " \t")
-				 (setq end (point)))
-			       (buffer-substring-no-properties
-				middle end))))))))
+				 ;; We tried calling `forward-sexp' in a loop
+				 ;; but it causes inconsistency for C names.
+				 (forward-sexp -1)
+				 ;; Is this C++ method?
+				 (when (and (< 2 middle)
+					    (string= (buffer-substring (- middle 2)
+								       middle)
+						     "::"))
+				   ;; Include "classname::".
+				   (setq middle (point)))
+				 ;; Ignore these subparts of a class decl
+				 ;; and move back to the class name itself.
+				 (while (looking-at "public \\|private ")
+				   (skip-chars-backward " \t:")
+				   (setq end (point))
+				   (backward-sexp 1)
+				   (setq middle (point))
+				   (forward-word -1))
+				 (and (bolp)
+				      (looking-at
+				       "enum \\|struct \\|union \\|class ")
+				      (setq middle (point)))
+				 (goto-char end)
+				 (when (eq (preceding-char) ?=)
+				   (forward-char -1)
+				   (skip-chars-backward " \t")
+				   (setq end (point)))
+				 (buffer-substring-no-properties
+				  middle end)))))))))
 		((memq major-mode add-log-tex-like-modes)
 		 (if (re-search-backward
 		      "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)"
diff --git a/lisp/align.el b/lisp/align.el
index 0a0144ee65a..75046c147cb 100644
--- a/lisp/align.el
+++ b/lisp/align.el
@@ -1,7 +1,7 @@
 ;;; align.el --- align text to a specific column, by regexp
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org> 
 ;; Maintainer: FSF
diff --git a/lisp/allout.el b/lisp/allout.el
index 02d67671008..c744ba367e6 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -1,7 +1,7 @@
 ;;; allout.el --- extensive outline mode for use alone and with other modes
 
 ;; Copyright (C) 1992, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <ken dot manheimer at gmail dot com>
 ;; Maintainer: Ken Manheimer <ken dot manheimer at gmail dot com>
diff --git a/lisp/ansi-color.el b/lisp/ansi-color.el
index 20cdfaad2cf..ad33ab2533d 100644
--- a/lisp/ansi-color.el
+++ b/lisp/ansi-color.el
@@ -1,7 +1,7 @@
 ;;; ansi-color.el --- translate ANSI escape sequences into faces
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/apropos.el b/lisp/apropos.el
index 0e243415141..8df7992230a 100644
--- a/lisp/apropos.el
+++ b/lisp/apropos.el
@@ -1,7 +1,7 @@
 ;;; apropos.el --- apropos commands for users and programmers
 
 ;; Copyright (C) 1989, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bigbird.bu.edu>
 ;; Rewritten: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/arc-mode.el b/lisp/arc-mode.el
index dc623e26796..1b0f3a3d584 100644
--- a/lisp/arc-mode.el
+++ b/lisp/arc-mode.el
@@ -1,7 +1,7 @@
 ;;; arc-mode.el --- simple editing of archives
 
 ;; Copyright (C) 1995, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@gnu.org>
 ;; Keywords: archives msdog editing major-mode
diff --git a/lisp/array.el b/lisp/array.el
index 6ebbd645520..979101ef75d 100644
--- a/lisp/array.el
+++ b/lisp/array.el
@@ -1,7 +1,7 @@
 ;;; array.el --- array editing commands for GNU Emacs
 
 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author David M. Brown
 ;; Maintainer: FSF
diff --git a/lisp/autoarg.el b/lisp/autoarg.el
index 16dea6d2264..39dd3219621 100644
--- a/lisp/autoarg.el
+++ b/lisp/autoarg.el
@@ -1,7 +1,7 @@
 ;;; autoarg.el --- make digit keys supply prefix args
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Created: 1998-09-04
diff --git a/lisp/autoinsert.el b/lisp/autoinsert.el
index 4df0b39b83e..7540ad78bcd 100644
--- a/lisp/autoinsert.el
+++ b/lisp/autoinsert.el
@@ -1,7 +1,7 @@
 ;;; autoinsert.el --- automatic mode-dependent insertion of text into new files
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 1995, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Charlie Martin <crm@cs.duke.edu>
 ;; Adapted-By: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index 9d189e027c0..cb8821bb64c 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -1,7 +1,7 @@
 ;;; autorevert.el --- revert buffers when files on disk change
 
 ;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Keywords: convenience
diff --git a/lisp/avoid.el b/lisp/avoid.el
index f493392c4b0..22eb4aad9aa 100644
--- a/lisp/avoid.el
+++ b/lisp/avoid.el
@@ -1,7 +1,7 @@
 ;;; avoid.el --- make mouse pointer stay out of the way of editing
 
 ;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: mouse
diff --git a/lisp/battery.el b/lisp/battery.el
index aec6865dc06..f10245f44ac 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -1,7 +1,7 @@
 ;;; battery.el --- display battery status information
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;; Keywords: hardware
diff --git a/lisp/bindings.el b/lisp/bindings.el
index 690431a99e6..669357de92d 100644
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -1,7 +1,7 @@
 ;;; bindings.el --- define standard key bindings and some variables
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 104a9c6512f..3c1469fef97 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -1,7 +1,7 @@
 ;;; bookmark.el --- set bookmarks, maybe annotate them, jump to them later
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: Karl Fogel <kfogel@red-bean.com>
@@ -1007,14 +1007,18 @@ In Info, return the current node."
 (defun bookmark-buffer-file-name ()
   "Return the current buffer's file in a way useful for bookmarks.
 For example, if this is a Info buffer, return the Info file's name."
-  (if (eq major-mode 'Info-mode)
-        Info-current-file
-    (or
-     buffer-file-name
-     (if (and (boundp 'dired-directory) dired-directory)
-         (if (stringp dired-directory)
-             dired-directory
-           (car dired-directory))))))
+  (cond
+   ((eq major-mode 'Info-mode)
+    Info-current-file)
+   (buffer-file-name
+    ;; Abbreviate the path, both so it's shorter and so it's more
+    ;; portable.  E.g., the user's home dir might be a different
+    ;; path on different machines, but "~/" will still reach it.
+    (abbreviate-file-name buffer-file-name))
+   ((and (boundp 'dired-directory) dired-directory)
+    (if (stringp dired-directory)
+        dired-directory
+      (car dired-directory)))))
 
 
 (defun bookmark-maybe-load-default-file ()
diff --git a/lisp/bs.el b/lisp/bs.el
index a42b22e8436..b1fa47100f0 100644
--- a/lisp/bs.el
+++ b/lisp/bs.el
@@ -1,7 +1,7 @@
 ;;; bs.el --- menu for selecting and displaying buffers
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Author: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Maintainer: Olaf Sylvester <Olaf.Sylvester@netsurf.de>
 ;; Keywords: convenience
diff --git a/lisp/buff-menu.el b/lisp/buff-menu.el
index 398b362d4e4..d67173ce733 100644
--- a/lisp/buff-menu.el
+++ b/lisp/buff-menu.el
@@ -1,7 +1,7 @@
 ;;; buff-menu.el --- buffer menu main function and support functions -*- coding:utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
diff --git a/lisp/button.el b/lisp/button.el
index 3924a9c9418..d3c4cd8ea9e 100644
--- a/lisp/button.el
+++ b/lisp/button.el
@@ -1,7 +1,7 @@
 ;;; button.el --- clickable buttons
 ;;
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: extensions
diff --git a/lisp/calc/README b/lisp/calc/README
index 00d0e9b232a..0920f73eb34 100644
--- a/lisp/calc/README
+++ b/lisp/calc/README
@@ -2,8 +2,8 @@
 This directory contains Calc, an advanced desk calculator for GNU
 Emacs.
 
-"Calc"  Copyright 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 
-   2005, 2006  Free Software Foundation, Inc.
+"Calc"  Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004, 
+   2005, 2006, 2007  Free Software Foundation, Inc.
 
 Written by:
 	Dave Gillespie
diff --git a/lisp/calc/calc-aent.el b/lisp/calc/calc-aent.el
index af1113dca76..e0727e17afb 100644
--- a/lisp/calc/calc-aent.el
+++ b/lisp/calc/calc-aent.el
@@ -1,7 +1,7 @@
 ;;; calc-aent.el --- algebraic entry functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-alg.el b/lisp/calc/calc-alg.el
index f2929eb5a84..e66be236782 100644
--- a/lisp/calc/calc-alg.el
+++ b/lisp/calc/calc-alg.el
@@ -1,7 +1,7 @@
 ;;; calc-alg.el --- algebraic functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger  <belanger@truman.edu>
diff --git a/lisp/calc/calc-arith.el b/lisp/calc/calc-arith.el
index ec09ae29318..0f6f6d6fbf0 100644
--- a/lisp/calc/calc-arith.el
+++ b/lisp/calc/calc-arith.el
@@ -1,7 +1,7 @@
 ;;; calc-arith.el --- arithmetic functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-bin.el b/lisp/calc/calc-bin.el
index 5a4cf72a0ac..7c82c5f1de8 100644
--- a/lisp/calc/calc-bin.el
+++ b/lisp/calc/calc-bin.el
@@ -1,7 +1,7 @@
 ;;; calc-bin.el --- binary functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-comb.el b/lisp/calc/calc-comb.el
index 7c274d39aa6..b47f3b3c222 100644
--- a/lisp/calc/calc-comb.el
+++ b/lisp/calc/calc-comb.el
@@ -1,7 +1,7 @@
 ;;; calc-comb.el --- combinatoric functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-cplx.el b/lisp/calc/calc-cplx.el
index 5223a98c7d0..aa454b7454f 100644
--- a/lisp/calc/calc-cplx.el
+++ b/lisp/calc/calc-cplx.el
@@ -1,7 +1,7 @@
 ;;; calc-cplx.el --- Complex number functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-embed.el b/lisp/calc/calc-embed.el
index e54a94e4d39..9313802ab86 100644
--- a/lisp/calc/calc-embed.el
+++ b/lisp/calc/calc-embed.el
@@ -1,7 +1,7 @@
 ;;; calc-embed.el --- embed Calc in a buffer
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index 8a6e65d74db..2eeae51613d 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -1,7 +1,7 @@
 ;;; calc-ext.el --- various extension functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-fin.el b/lisp/calc/calc-fin.el
index 0f4f00a958a..008e38a1e73 100644
--- a/lisp/calc/calc-fin.el
+++ b/lisp/calc/calc-fin.el
@@ -1,7 +1,7 @@
 ;;; calc-fin.el --- financial functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-forms.el b/lisp/calc/calc-forms.el
index 7ebbba2aec5..00c43af7c59 100644
--- a/lisp/calc/calc-forms.el
+++ b/lisp/calc/calc-forms.el
@@ -1,7 +1,7 @@
 ;;; calc-forms.el --- data format conversion functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-frac.el b/lisp/calc/calc-frac.el
index 59849cbf975..8329d95e899 100644
--- a/lisp/calc/calc-frac.el
+++ b/lisp/calc/calc-frac.el
@@ -1,7 +1,7 @@
 ;;; calc-frac.el --- fraction functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-funcs.el b/lisp/calc/calc-funcs.el
index 291cbc9b47f..e9b5ec97539 100644
--- a/lisp/calc/calc-funcs.el
+++ b/lisp/calc/calc-funcs.el
@@ -1,7 +1,7 @@
 ;;; calc-funcs.el --- well-known functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-graph.el b/lisp/calc/calc-graph.el
index 355f66649ca..e7473fa57ca 100644
--- a/lisp/calc/calc-graph.el
+++ b/lisp/calc/calc-graph.el
@@ -1,7 +1,7 @@
 ;;; calc-graph.el --- graph output functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-help.el b/lisp/calc/calc-help.el
index 510e61a12b6..6d3f072554f 100644
--- a/lisp/calc/calc-help.el
+++ b/lisp/calc/calc-help.el
@@ -1,7 +1,7 @@
 ;;; calc-help.el --- help display functions for Calc,
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
@@ -414,7 +414,7 @@ C-w  Describe how there is no warranty for Calc."
     (princ (format "GNU Emacs Calculator version %s.\n"
 		   calc-version))
     (princ "  By Dave Gillespie.\n")
-    (princ "  Copyright (C) 2006 Free Software Foundation, Inc.\n\n")
+    (princ "  Copyright (C) 2007 Free Software Foundation, Inc.\n\n")
     (princ "Type `h s' for a more detailed summary.\n")
     (princ "Or type `h i' to read the full Calc manual on-line.\n\n")
     (princ "Basic keys:\n")
diff --git a/lisp/calc/calc-incom.el b/lisp/calc/calc-incom.el
index ac25ad5b875..a32b6c09f85 100644
--- a/lisp/calc/calc-incom.el
+++ b/lisp/calc/calc-incom.el
@@ -1,7 +1,7 @@
 ;;; calc-incom.el --- complex data type input functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-keypd.el b/lisp/calc/calc-keypd.el
index b04804eb1ba..3e5fa194609 100644
--- a/lisp/calc/calc-keypd.el
+++ b/lisp/calc/calc-keypd.el
@@ -1,7 +1,7 @@
 ;;; calc-keypd.el --- mouse-capable keypad input for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-lang.el b/lisp/calc/calc-lang.el
index 07bc0e247f7..fc584f2213f 100644
--- a/lisp/calc/calc-lang.el
+++ b/lisp/calc/calc-lang.el
@@ -1,7 +1,7 @@
 ;;; calc-lang.el --- calc language functions
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-macs.el b/lisp/calc/calc-macs.el
index 496c3fff858..4db6d9752e1 100644
--- a/lisp/calc/calc-macs.el
+++ b/lisp/calc/calc-macs.el
@@ -1,7 +1,7 @@
 ;;; calc-macs.el --- important macros for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-map.el b/lisp/calc/calc-map.el
index c9c71b3ebf1..5fcaecd95e9 100644
--- a/lisp/calc/calc-map.el
+++ b/lisp/calc/calc-map.el
@@ -1,7 +1,7 @@
 ;;; calc-map.el --- higher-order functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-math.el b/lisp/calc/calc-math.el
index 869d7457ed6..96cfd6fc50d 100644
--- a/lisp/calc/calc-math.el
+++ b/lisp/calc/calc-math.el
@@ -1,7 +1,7 @@
 ;;; calc-math.el --- mathematical functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-misc.el b/lisp/calc/calc-misc.el
index 14bf3908b83..0f3547ed06e 100644
--- a/lisp/calc/calc-misc.el
+++ b/lisp/calc/calc-misc.el
@@ -1,7 +1,7 @@
 ;;; calc-misc.el --- miscellaneous functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-mode.el b/lisp/calc/calc-mode.el
index 9b3bc297a80..14cb3c746d5 100644
--- a/lisp/calc/calc-mode.el
+++ b/lisp/calc/calc-mode.el
@@ -1,7 +1,7 @@
 ;;; calc-mode.el --- calculator modes for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-mtx.el b/lisp/calc/calc-mtx.el
index 2945049a744..4d4201aee5a 100644
--- a/lisp/calc/calc-mtx.el
+++ b/lisp/calc/calc-mtx.el
@@ -1,7 +1,7 @@
 ;;; calc-mtx.el --- matrix functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-poly.el b/lisp/calc/calc-poly.el
index 6d1780ce357..aef7a28efd4 100644
--- a/lisp/calc/calc-poly.el
+++ b/lisp/calc/calc-poly.el
@@ -1,7 +1,7 @@
 ;;; calc-poly.el --- polynomial functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-prog.el b/lisp/calc/calc-prog.el
index ea625c7a77c..41e9254ffd6 100644
--- a/lisp/calc/calc-prog.el
+++ b/lisp/calc/calc-prog.el
@@ -1,7 +1,7 @@
 ;;; calc-prog.el --- user programmability functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-rewr.el b/lisp/calc/calc-rewr.el
index d7530dc4cb6..0159f50dc45 100644
--- a/lisp/calc/calc-rewr.el
+++ b/lisp/calc/calc-rewr.el
@@ -1,7 +1,7 @@
 ;;; calc-rewr.el --- rewriting functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-rules.el b/lisp/calc/calc-rules.el
index 339993f98a5..23ae04ac114 100644
--- a/lisp/calc/calc-rules.el
+++ b/lisp/calc/calc-rules.el
@@ -1,7 +1,7 @@
 ;;; calc-rules.el --- rules for simplifying algebraic expressions in Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-sel.el b/lisp/calc/calc-sel.el
index 7f6dbb7f999..01d8ec3fc30 100644
--- a/lisp/calc/calc-sel.el
+++ b/lisp/calc/calc-sel.el
@@ -1,7 +1,7 @@
 ;;; calc-sel.el --- data selection functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-stat.el b/lisp/calc/calc-stat.el
index 2b4f8e7358f..0631a823c5f 100644
--- a/lisp/calc/calc-stat.el
+++ b/lisp/calc/calc-stat.el
@@ -1,7 +1,7 @@
 ;;; calc-stat.el --- statistical functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index 218ae46b88a..458a5ea9268 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -1,7 +1,7 @@
 ;;; calc-store.el --- value storage functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-stuff.el b/lisp/calc/calc-stuff.el
index 708dff18632..6cb1a9b1974 100644
--- a/lisp/calc/calc-stuff.el
+++ b/lisp/calc/calc-stuff.el
@@ -1,7 +1,7 @@
 ;;; calc-stuff.el --- miscellaneous functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-trail.el b/lisp/calc/calc-trail.el
index e93e5e5c88c..a6ed07f7612 100644
--- a/lisp/calc/calc-trail.el
+++ b/lisp/calc/calc-trail.el
@@ -1,7 +1,7 @@
 ;;; calc-trail.el --- functions for manipulating the Calc "trail"
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-undo.el b/lisp/calc/calc-undo.el
index 0d429ef145a..80259d4ee26 100644
--- a/lisp/calc/calc-undo.el
+++ b/lisp/calc/calc-undo.el
@@ -1,7 +1,7 @@
 ;;; calc-undo.el --- undo functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index 68e294a5939..5a010236226 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -1,7 +1,7 @@
 ;;; calc-units.el --- unit conversion functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-vec.el b/lisp/calc/calc-vec.el
index 3ec387053c3..1980ab7cc04 100644
--- a/lisp/calc/calc-vec.el
+++ b/lisp/calc/calc-vec.el
@@ -1,7 +1,7 @@
 ;;; calc-vec.el --- vector functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc-yank.el b/lisp/calc/calc-yank.el
index 2d80561faac..f957cf4cc14 100644
--- a/lisp/calc/calc-yank.el
+++ b/lisp/calc/calc-yank.el
@@ -1,7 +1,7 @@
 ;;; calc-yank.el --- kill-ring functionality for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 35b7c19cf1a..43bddbfe2c8 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -1,7 +1,7 @@
 ;;; calc.el --- the GNU Emacs calculator
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg2.el b/lisp/calc/calcalg2.el
index f71e58e223a..5443cc883bd 100644
--- a/lisp/calc/calcalg2.el
+++ b/lisp/calc/calcalg2.el
@@ -1,7 +1,7 @@
 ;;; calcalg2.el --- more algebraic functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcalg3.el b/lisp/calc/calcalg3.el
index 4c0134263d9..b4d1eee854e 100644
--- a/lisp/calc/calcalg3.el
+++ b/lisp/calc/calcalg3.el
@@ -1,7 +1,7 @@
 ;;; calcalg3.el --- more algebraic functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 9b5eab5b133..05ec4daf920 100644
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,7 +1,7 @@
 ;;; calccomp.el --- composition functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calc/calcsel2.el b/lisp/calc/calcsel2.el
index 3f5b94ef771..d0f982f1598 100644
--- a/lisp/calc/calcsel2.el
+++ b/lisp/calc/calcsel2.el
@@ -1,7 +1,7 @@
 ;;; calcsel2.el --- selection functions for Calc
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <belanger@truman.edu>
diff --git a/lisp/calculator.el b/lisp/calculator.el
index fb5e9e41f69..363e98a804f 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -1,7 +1,7 @@
 ;;; calculator.el --- a [not so] simple calculator for Emacs
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eli Barzilay <eli@barzilay.org>
 ;; Keywords: tools, convenience
diff --git a/lisp/calendar/appt.el b/lisp/calendar/appt.el
index 892c76bba0c..82fa0e66dbf 100644
--- a/lisp/calendar/appt.el
+++ b/lisp/calendar/appt.el
@@ -1,7 +1,7 @@
 ;;; appt.el --- appointment notification functions
 
 ;; Copyright (C) 1989, 1990, 1994, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Neil Mager <neilm@juliet.ll.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/cal-bahai.el b/lisp/calendar/cal-bahai.el
index f6419cf9a82..06703e3b73b 100644
--- a/lisp/calendar/cal-bahai.el
+++ b/lisp/calendar/cal-bahai.el
@@ -1,6 +1,6 @@
 ;;; cal-bahai.el --- calendar functions for the Baha'i calendar.
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/calendar/cal-china.el b/lisp/calendar/cal-china.el
index 5cdaa5092aa..1c08d553754 100644
--- a/lisp/calendar/cal-china.el
+++ b/lisp/calendar/cal-china.el
@@ -1,6 +1,6 @@
 ;;; cal-china.el --- calendar functions for the Chinese calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-coptic.el b/lisp/calendar/cal-coptic.el
index c37ab17567f..23de17a16a8 100644
--- a/lisp/calendar/cal-coptic.el
+++ b/lisp/calendar/cal-coptic.el
@@ -1,6 +1,6 @@
 ;;; cal-coptic.el --- calendar functions for the Coptic/Ethiopic calendars
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-dst.el b/lisp/calendar/cal-dst.el
index ddd317de106..928c42f9122 100644
--- a/lisp/calendar/cal-dst.el
+++ b/lisp/calendar/cal-dst.el
@@ -1,7 +1,7 @@
 ;;; cal-dst.el --- calendar functions for daylight savings rules
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Paul Eggert <eggert@twinsun.com>
 ;;	Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-french.el b/lisp/calendar/cal-french.el
index 0d88f161a03..99af7042472 100644
--- a/lisp/calendar/cal-french.el
+++ b/lisp/calendar/cal-french.el
@@ -1,7 +1,7 @@
 ;;; cal-french.el --- calendar functions for the French Revolutionary calendar
 
 ;; Copyright (C) 1988, 1989, 1992, 1994, 1995, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/cal-hebrew.el b/lisp/calendar/cal-hebrew.el
index 1272e9966d4..a61bea8eacf 100644
--- a/lisp/calendar/cal-hebrew.el
+++ b/lisp/calendar/cal-hebrew.el
@@ -1,6 +1,6 @@
 ;;; cal-hebrew.el --- calendar functions for the Hebrew calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Nachum Dershowitz <nachum@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-html.el b/lisp/calendar/cal-html.el
index f5d08d18c17..110a612db66 100644
--- a/lisp/calendar/cal-html.el
+++ b/lisp/calendar/cal-html.el
@@ -1,6 +1,6 @@
 ;;; cal-html.el --- functions for printing HTML calendars
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Anna M. Bigatti <bigatti@dima.unige.it>
 ;; Keywords: calendar
diff --git a/lisp/calendar/cal-islam.el b/lisp/calendar/cal-islam.el
index 105bb288eb0..28faed4d397 100644
--- a/lisp/calendar/cal-islam.el
+++ b/lisp/calendar/cal-islam.el
@@ -1,6 +1,6 @@
 ;;; cal-islam.el --- calendar functions for the Islamic calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-iso.el b/lisp/calendar/cal-iso.el
index c11968e8421..93b39cd4d15 100644
--- a/lisp/calendar/cal-iso.el
+++ b/lisp/calendar/cal-iso.el
@@ -1,6 +1,6 @@
 ;;; cal-iso.el --- calendar functions for the ISO calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-julian.el b/lisp/calendar/cal-julian.el
index 8f7af039d94..768e57bbab5 100644
--- a/lisp/calendar/cal-julian.el
+++ b/lisp/calendar/cal-julian.el
@@ -1,6 +1,6 @@
 ;;; cal-julian.el --- calendar functions for the Julian calendar
 
-;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-mayan.el b/lisp/calendar/cal-mayan.el
index b2d111a4b18..20703cb85b6 100644
--- a/lisp/calendar/cal-mayan.el
+++ b/lisp/calendar/cal-mayan.el
@@ -1,7 +1,7 @@
 ;;; cal-mayan.el --- calendar functions for the Mayan calendars
 
 ;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Stewart M. Clamen <clamen@cs.cmu.edu>
 ;;	Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-menu.el b/lisp/calendar/cal-menu.el
index 1bae5ce6299..1320f778cc6 100644
--- a/lisp/calendar/cal-menu.el
+++ b/lisp/calendar/cal-menu.el
@@ -1,6 +1,6 @@
 ;;; cal-menu.el --- calendar functions for menu bar and popup menu support
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-move.el b/lisp/calendar/cal-move.el
index f7c8b284f1b..b12289c7456 100644
--- a/lisp/calendar/cal-move.el
+++ b/lisp/calendar/cal-move.el
@@ -1,6 +1,6 @@
 ;;; cal-move.el --- calendar functions for movement in the calendar
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-persia.el b/lisp/calendar/cal-persia.el
index 33c296a7730..6055de121af 100644
--- a/lisp/calendar/cal-persia.el
+++ b/lisp/calendar/cal-persia.el
@@ -1,6 +1,6 @@
 ;;; cal-persia.el --- calendar functions for the Persian calendar
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el
index 1fd85513230..e229f02002f 100644
--- a/lisp/calendar/cal-tex.el
+++ b/lisp/calendar/cal-tex.el
@@ -1,6 +1,6 @@
 ;;; cal-tex.el --- calendar functions for printing calendars with LaTeX
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Steve Fisk <fisk@bowdoin.edu>
diff --git a/lisp/calendar/cal-x.el b/lisp/calendar/cal-x.el
index 2e465e1093b..b7f1748ff34 100644
--- a/lisp/calendar/cal-x.el
+++ b/lisp/calendar/cal-x.el
@@ -1,6 +1,6 @@
 ;;; cal-x.el --- calendar windows in dedicated frames in X
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.sunysb.edu>
diff --git a/lisp/calendar/calendar.el b/lisp/calendar/calendar.el
index c0249223a06..711de4c1f28 100644
--- a/lisp/calendar/calendar.el
+++ b/lisp/calendar/calendar.el
@@ -1,7 +1,7 @@
 ;;; calendar.el --- calendar functions
 
 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 95588fccd92..a5644f7972d 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1,7 +1,7 @@
 ;;; diary-lib.el --- diary functions
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 5a29bf8fff1..6f53a47221a 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -1,7 +1,7 @@
 ;;; holidays.el --- holiday functions for the calendar package
 
 ;; Copyright (C) 1989, 1990, 1992, 1993, 1994, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 9de4d1f3954..cb9885fc125 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -1,6 +1,6 @@
 ;;; icalendar.el --- iCalendar implementation -*-coding: utf-8 -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author:         Ulf Jasper <ulf.jasper@web.de>
 ;; Created:        August 2002
diff --git a/lisp/calendar/lunar.el b/lisp/calendar/lunar.el
index dd2f546fc37..95bcae3875a 100644
--- a/lisp/calendar/lunar.el
+++ b/lisp/calendar/lunar.el
@@ -1,7 +1,7 @@
 ;;; lunar.el --- calendar functions for phases of the moon
 
 ;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/calendar/parse-time.el b/lisp/calendar/parse-time.el
index 9587eb57a9f..4a786da7726 100644
--- a/lisp/calendar/parse-time.el
+++ b/lisp/calendar/parse-time.el
@@ -1,6 +1,6 @@
 ;;; parse-time.el --- parsing time strings
 
-;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
diff --git a/lisp/calendar/solar.el b/lisp/calendar/solar.el
index 660abb14f88..f8112b3e896 100644
--- a/lisp/calendar/solar.el
+++ b/lisp/calendar/solar.el
@@ -1,7 +1,7 @@
 ;;; solar.el --- calendar functions for solar events
 
 ;; Copyright (C) 1992, 1993, 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Edward M. Reingold <reingold@cs.uiuc.edu>
 ;;	Denis B. Roegel <Denis.Roegel@loria.fr>
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 0de9806d2bb..f00c480da8b 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -1,6 +1,6 @@
 ;;; time-date.el --- Date and time handling functions
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/calendar/timeclock.el b/lisp/calendar/timeclock.el
index 13b3671e16a..398b2dd1de5 100644
--- a/lisp/calendar/timeclock.el
+++ b/lisp/calendar/timeclock.el
@@ -1,6 +1,6 @@
 ;;; timeclock.el --- mode for keeping track of how much you work
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
diff --git a/lisp/calendar/todo-mode.el b/lisp/calendar/todo-mode.el
index 6f96ec1cdb2..9449c84cb2a 100644
--- a/lisp/calendar/todo-mode.el
+++ b/lisp/calendar/todo-mode.el
@@ -1,6 +1,6 @@
 ;;; todo-mode.el --- major mode for editing TODO list files
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Oliver Seidel <os10000@seidel-space.de>
diff --git a/lisp/case-table.el b/lisp/case-table.el
index d4961bd50cf..64cf69ba2bf 100644
--- a/lisp/case-table.el
+++ b/lisp/case-table.el
@@ -1,7 +1,7 @@
 ;;; case-table.el --- code to extend the character set and support case tables
 
 ;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/cdl.el b/lisp/cdl.el
index 4724c2f7ecc..d238a42dd68 100644
--- a/lisp/cdl.el
+++ b/lisp/cdl.el
@@ -1,7 +1,7 @@
 ;;; cdl.el --- Common Data Language (CDL) utility functions for GNU Emacs
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: ATAE@spva.physics.imperial.ac.uk (Ata Etemadi)
 ;; Maintainer: FSF
diff --git a/lisp/chistory.el b/lisp/chistory.el
index d2578c53c2d..286750418cf 100644
--- a/lisp/chistory.el
+++ b/lisp/chistory.el
@@ -1,7 +1,7 @@
 ;;; chistory.el --- list command history
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/cmuscheme.el b/lisp/cmuscheme.el
index d2a7217a1dc..12840441a6a 100644
--- a/lisp/cmuscheme.el
+++ b/lisp/cmuscheme.el
@@ -1,7 +1,7 @@
 ;;; cmuscheme.el --- Scheme process in a buffer. Adapted from tea.el
 
 ;; Copyright (C) 1988, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <olin.shivers@cs.cmu.edu>
 ;; Maintainer: FSF
diff --git a/lisp/comint.el b/lisp/comint.el
index 1ab285c9af4..cd5a9a9c13a 100644
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1,7 +1,7 @@
 ;;; comint.el --- general command interpreter in a window stuff
 
 ;; Copyright (C) 1988, 1990, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
diff --git a/lisp/compare-w.el b/lisp/compare-w.el
index 4aeb20b1091..e81c6cd3bc2 100644
--- a/lisp/compare-w.el
+++ b/lisp/compare-w.el
@@ -1,7 +1,7 @@
 ;;; compare-w.el --- compare text between windows for Emacs
 
 ;; Copyright (C) 1986, 1989, 1993, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience files
diff --git a/lisp/complete.el b/lisp/complete.el
index 9083482d8fc..cc8f29356b6 100644
--- a/lisp/complete.el
+++ b/lisp/complete.el
@@ -1,7 +1,7 @@
 ;;; complete.el --- partial completion mechanism plus other goodies
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: abbrev convenience
diff --git a/lisp/completion.el b/lisp/completion.el
index 8d49944e19c..25b95852536 100644
--- a/lisp/completion.el
+++ b/lisp/completion.el
@@ -1,7 +1,7 @@
 ;;; completion.el --- dynamic word-completion code
 
 ;; Copyright (C) 1990, 1993, 1995, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev convenience
diff --git a/lisp/composite.el b/lisp/composite.el
index 181e1fd6f46..ede7d023e87 100644
--- a/lisp/composite.el
+++ b/lisp/composite.el
@@ -1,6 +1,6 @@
 ;;; composite.el --- support character composition
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/cus-dep.el b/lisp/cus-dep.el
index 6b455c7cf70..713b84f8bc0 100644
--- a/lisp/cus-dep.el
+++ b/lisp/cus-dep.el
@@ -1,7 +1,7 @@
 ;;; cus-dep.el --- find customization dependencies
 ;;
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 27ce163157b..ce429a40823 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -1,7 +1,7 @@
 ;;; cus-edit.el --- tools for customizing Emacs and Lisp packages
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
diff --git a/lisp/cus-face.el b/lisp/cus-face.el
index e847ae1f230..76935a0d605 100644
--- a/lisp/cus-face.el
+++ b/lisp/cus-face.el
@@ -1,7 +1,7 @@
 ;;; cus-face.el --- customization support for faces
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
diff --git a/lisp/cus-start.el b/lisp/cus-start.el
index 15f314d75e7..b7aa673f1b8 100644
--- a/lisp/cus-start.el
+++ b/lisp/cus-start.el
@@ -1,7 +1,7 @@
 ;;; cus-start.el --- define customization properties of builtins
 ;;
 ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: internal
diff --git a/lisp/cus-theme.el b/lisp/cus-theme.el
index b4fe1e4b0bf..5dc34410815 100644
--- a/lisp/cus-theme.el
+++ b/lisp/cus-theme.el
@@ -1,7 +1,7 @@
 ;;; cus-theme.el -- custom theme creation user interface
 ;;
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/custom.el b/lisp/custom.el
index 699d432fb70..d53951793d2 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -1,7 +1,7 @@
 ;;; custom.el --- tools for declaring and initializing options
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
diff --git a/lisp/cvs-status.el b/lisp/cvs-status.el
index 7d4f687e053..428b2887db5 100644
--- a/lisp/cvs-status.el
+++ b/lisp/cvs-status.el
@@ -1,7 +1,7 @@
 ;;; cvs-status.el --- major mode for browsing `cvs status' output -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs cvs status tree tools
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 624a59bf880..ae16b52ee7d 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,7 +1,7 @@
 ;;; dabbrev.el --- dynamic abbreviation package
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1996, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Don Morrison
 ;; Maintainer: Lars Lindberg <Lars.Lindberg@sypro.cap.se>
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index ff6c6337eb0..9e143dc0b09 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -1,7 +1,7 @@
 ;;; delim-col.el --- prettify all columns in a region or rectangle
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/delsel.el b/lisp/delsel.el
index 278849233b7..7028bad9ad4 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -1,7 +1,7 @@
 ;;; delsel.el --- delete selection if you insert
 
 ;; Copyright (C) 1992, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Matthieu Devin <devin@lucid.com>
 ;; Maintainer: FSF
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 361c3b8c15c..64920336db9 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -1,7 +1,7 @@
 ;;; descr-text.el --- describe text mode
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/desktop.el b/lisp/desktop.el
index d2b2271d306..442c81bf730 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,7 @@
 ;;; desktop.el --- save partial status of Emacs when killed
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainter: Lars Hansen <larsh@soem.dk>
diff --git a/lisp/dframe.el b/lisp/dframe.el
index f77a5059026..a640540a46a 100644
--- a/lisp/dframe.el
+++ b/lisp/dframe.el
@@ -1,7 +1,7 @@
 ;;; dframe --- dedicate frame support modes
 
 ;;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;    2005, 2006 Free Software Foundation, Inc.
+;;    2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 9226c537531..edf7317f2b4 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1,7 +1,7 @@
 ;;; diff-mode.el --- a mode for viewing/editing context diffs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: convenience patch diff
@@ -1083,6 +1083,83 @@ Only works for unified diffs."
 			      nil t)
 	   (equal (match-string 1) (match-string 2)))))
 
+(defun diff-sanity-check-context-hunk-half (lines)
+  (let ((count lines))
+    (while
+        (cond
+         ((and (memq (char-after) '(?\s ?! ?+ ?-))
+               (memq (char-after (1+ (point))) '(?\s ?\t)))
+          (decf count) t)
+         ((or (zerop count) (= count lines)) nil)
+         ((memq (char-after) '(?! ?+ ?-))
+          (if (not (and (eq (char-after (1+ (point))) ?\n)
+                        (y-or-n-p "Try to auto-fix whitespace loss damage? ")))
+              (error "End of hunk ambiguously marked")
+            (forward-char 1) (insert " ") (forward-line -1) t))
+         ((< lines 0)
+          (error "End of hunk ambiguously marked"))
+         ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? "))
+          (error "Abort!"))
+         ((eolp) (insert "  ") (forward-line -1) t)
+         (t (insert " ") (delete-region (- (point) 2) (- (point) 1)) t))
+      (forward-line))))
+
+(defun diff-sanity-check-hunk ()
+  (let (;; Every modification is protected by a y-or-n-p, so it's probably
+        ;; OK to override a read-only setting.
+        (inhibit-read-only t))
+    (save-excursion
+      (cond
+       ((not (looking-at diff-hunk-header-re))
+        (error "Not recognizable hunk header"))
+
+       ;; A context diff.
+       ((eq (char-after) ?*)
+        (if (not (looking-at "\\*\\{15\\}\n\\*\\*\\* \\([0-9]+\\),\\([0-9]+\\) \\*\\*\\*\\*$"))
+            (error "Unrecognized context diff first hunk header format")
+          (forward-line 2)
+          (diff-sanity-check-context-hunk-half
+           (1+ (- (string-to-number (match-string 2))
+                  (string-to-number (match-string 1)))))
+          (if (not (looking-at "--- \\([0-9]+\\),\\([0-9]+\\) ----$"))
+              (error "Unrecognized context diff second hunk header format")
+            (forward-line)
+            (diff-sanity-check-context-hunk-half
+             (1+ (- (string-to-number (match-string 2))
+                    (string-to-number (match-string 1))))))))
+
+       ;; A unified diff.
+       ((eq (char-after) ?@)
+        (if (not (looking-at
+                  "@@ -[0-9]+,\\([0-9]+\\) \\+[0-9]+,\\([0-9]+\\) @@$"))
+            (error "Unrecognized unified diff hunk header format")
+          (let ((before (string-to-number (match-string 1)))
+                (after (string-to-number (match-string 2))))
+            (forward-line)
+            (while
+                (case (char-after)
+                  (?\s (decf before) (decf after) t)
+                  (?- (decf before) t)
+                  (?+ (decf after) t)
+                  (t
+                   (cond
+                    ((and (zerop before) (zerop after)) nil)
+                    ((or (< before 0) (< after 0))
+                     (error (if (or (zerop before) (zerop after))
+                                "End of hunk ambiguously marked"
+                              "Hunk seriously messed up")))
+                    ((not (y-or-n-p "Try to auto-fix whitespace loss and word-wrap damage? "))
+                     (error "Abort!"))
+                    ((eolp) (insert " ") (forward-line -1) t)
+                    (t (insert " ")
+                       (delete-region (- (point) 2) (- (point) 1)) t))))
+              (forward-line)))))
+
+       ;; A plain diff.
+       (t
+        ;; TODO.
+        )))))
+
 (defun diff-hunk-text (hunk destp char-offset)
   "Return the literal source text from HUNK as (TEXT . OFFSET).
 If DESTP is nil, TEXT is the source, otherwise the destination text.
@@ -1210,6 +1287,11 @@ SWITCHED is non-nil if the patch is already applied."
   (save-excursion
     (let* ((other (diff-xor other-file diff-jump-to-old-file))
 	   (char-offset (- (point) (progn (diff-beginning-of-hunk) (point))))
+           ;; Check that the hunk is well-formed.  Otherwise diff-mode and
+           ;; the user may disagree on what constitutes the hunk
+           ;; (e.g. because an empty line truncates the hunk mid-course),
+           ;; leading to potentially nasty surprises for the user.
+           (_ (diff-sanity-check-hunk))
 	   (hunk (buffer-substring (point)
 				   (save-excursion (diff-end-of-hunk) (point))))
 	   (old (diff-hunk-text hunk reverse char-offset))
diff --git a/lisp/diff.el b/lisp/diff.el
index 534a84d4317..83de826bd03 100644
--- a/lisp/diff.el
+++ b/lisp/diff.el
@@ -1,7 +1,7 @@
 ;;; diff.el --- run `diff' in compilation-mode
 
 ;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index 257332f4495..6018d882191 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -1,7 +1,7 @@
 ;;; dired-aux.el --- less commonly used parts of dired  -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>.
 ;; Maintainer: FSF
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 942d16d3478..ef4affcfe3f 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -8,7 +8,7 @@
 ;; Keywords: dired extensions files
 
 ;; Copyright (C) 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/dired.el b/lisp/dired.el
index 4f2e1b74b10..7734a9bd69f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1,7 +1,7 @@
 ;;; dired.el --- directory-browsing commands
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Maintainer: FSF
@@ -56,7 +56,7 @@ may contain even `F', `b', `i' and `s'.  See also the variable
 `dired-ls-F-marks-symlinks' concerning the `F' switch.
 On systems such as MS-DOS and MS-Windows, which use `ls' emulation in Lisp,
 some of the `ls' switches are not supported; see the doc string of
-`insert-directory' on `ls-lisp.el' for more details."
+`insert-directory' in `ls-lisp.el' for more details."
   :type 'string
   :group 'dired)
 
diff --git a/lisp/dirtrack.el b/lisp/dirtrack.el
index 5a508b31c5e..36009d16172 100644
--- a/lisp/dirtrack.el
+++ b/lisp/dirtrack.el
@@ -1,7 +1,7 @@
 ;;; dirtrack.el --- Directory Tracking by watching the prompt
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Nov 17 1996
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index d436a33e477..fa98086b0bc 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -1,7 +1,7 @@
 ;;; disp-table.el --- functions for dealing with char tables
 
 ;; Copyright (C) 1987, 1994, 1995, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Based on a previous version by Howard Gayle
diff --git a/lisp/dnd.el b/lisp/dnd.el
index 1f3c8d71266..2b523476a4f 100644
--- a/lisp/dnd.el
+++ b/lisp/dnd.el
@@ -1,6 +1,6 @@
 ;;; dnd.el --- drag and drop support.
 
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
diff --git a/lisp/dos-fns.el b/lisp/dos-fns.el
index b50a1a2ea85..cf626185e99 100644
--- a/lisp/dos-fns.el
+++ b/lisp/dos-fns.el
@@ -1,7 +1,7 @@
 ;;; dos-fns.el --- MS-Dos specific functions
 
 ;; Copyright (C) 1991, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Morten Welinder <terra@diku.dk>
 ;; Keywords: internal
diff --git a/lisp/dos-vars.el b/lisp/dos-vars.el
index b79238fc888..f0b6c82f839 100644
--- a/lisp/dos-vars.el
+++ b/lisp/dos-vars.el
@@ -1,7 +1,7 @@
 ;;; dos-vars.el --- MS-Dos specific user options
 
 ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/dos-w32.el b/lisp/dos-w32.el
index bce5cbcdc8a..94ba5def7b5 100644
--- a/lisp/dos-w32.el
+++ b/lisp/dos-w32.el
@@ -1,7 +1,7 @@
 ;; dos-w32.el --- Functions shared among MS-DOS and W32 (NT/95) platforms
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
diff --git a/lisp/double.el b/lisp/double.el
index 01753342b47..bb2bf6577b3 100644
--- a/lisp/double.el
+++ b/lisp/double.el
@@ -1,7 +1,7 @@
 ;;; double.el --- support for keyboard remapping with double clicking
 
 ;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: i18n
diff --git a/lisp/ebuff-menu.el b/lisp/ebuff-menu.el
index 9072d911946..52d4f3f6e52 100644
--- a/lisp/ebuff-menu.el
+++ b/lisp/ebuff-menu.el
@@ -1,7 +1,7 @@
 ;;; ebuff-menu.el --- electric-buffer-list mode
 
 ;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@ai.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/echistory.el b/lisp/echistory.el
index 85c94d5d3dd..036ba3044e2 100644
--- a/lisp/echistory.el
+++ b/lisp/echistory.el
@@ -1,7 +1,7 @@
 ;;; echistory.el --- Electric Command History Mode
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/ediff-diff.el b/lisp/ediff-diff.el
index 34a1ceda254..f1fbc5eea61 100644
--- a/lisp/ediff-diff.el
+++ b/lisp/ediff-diff.el
@@ -1,7 +1,7 @@
 ;;; ediff-diff.el --- diff-related utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-help.el b/lisp/ediff-help.el
index d5f505c7de3..c3aa34e3c69 100644
--- a/lisp/ediff-help.el
+++ b/lisp/ediff-help.el
@@ -1,7 +1,7 @@
 ;;; ediff-help.el --- Code related to the contents of Ediff help buffers
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-hook.el b/lisp/ediff-hook.el
index fcf261efd06..17df800acc8 100644
--- a/lisp/ediff-hook.el
+++ b/lisp/ediff-hook.el
@@ -1,7 +1,7 @@
 ;;; ediff-hook.el --- setup for Ediff's menus and autoloads
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-init.el b/lisp/ediff-init.el
index 75b2fdc6fc5..0ecc809797f 100644
--- a/lisp/ediff-init.el
+++ b/lisp/ediff-init.el
@@ -1,7 +1,7 @@
 ;;; ediff-init.el --- Macros, variables, and defsubsts used by Ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el
index 2dba9e4116b..79a9c48718a 100644
--- a/lisp/ediff-merg.el
+++ b/lisp/ediff-merg.el
@@ -1,7 +1,7 @@
 ;;; ediff-merg.el --- merging utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index 2ee573a4cb9..8fdd319746c 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -1,7 +1,7 @@
 ;;; ediff-mult.el --- support for multi-file/multi-buffer processing in Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-ptch.el b/lisp/ediff-ptch.el
index b911c33f0fb..c8a8b70f162 100644
--- a/lisp/ediff-ptch.el
+++ b/lisp/ediff-ptch.el
@@ -1,7 +1,7 @@
 ;;; ediff-ptch.el --- Ediff's  patch support
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-util.el b/lisp/ediff-util.el
index 015e6bfff3e..7483128b71a 100644
--- a/lisp/ediff-util.el
+++ b/lisp/ediff-util.el
@@ -1,7 +1,7 @@
 ;;; ediff-util.el --- the core commands and utilities of ediff
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -3346,13 +3346,14 @@ Without an argument, it saves customized diff argument, if available
     (setq wind (ediff-get-visible-buffer-window cloned-buff))
     (select-window wind)
     (delete-other-windows)
+    (ediff-activate-mark)
     (split-window-vertically)
     (ediff-select-lowest-window)
     (setq other-wind (selected-window))
     (with-temp-buffer
       (erase-buffer)
       (insert
-       (format "\n   *******  Mark a region in buffer %s  *******\n"
+       (format "\n   *******  Mark a region in buffer %s (or confirm the existing one)  *******\n"
 	       (buffer-name cloned-buff)))
       (insert
        (ediff-with-current-buffer buff
@@ -4059,7 +4060,11 @@ Mail anyway? (y or n) ")
 (defun ediff-activate-mark ()
   (ediff-cond-compile-for-xemacs-or-emacs
    (zmacs-activate-region) ; xemacs
-   (setq mark-active t) ; emacs
+   (progn
+     (make-local-variable 'transient-mark-mode)
+     (setq mark-active t
+	   transient-mark-mode t) ; emacs
+     )
    ))
 
 (cond ((fboundp 'nuke-selective-display)
diff --git a/lisp/ediff-vers.el b/lisp/ediff-vers.el
index eb34e183822..9bbcf99d788 100644
--- a/lisp/ediff-vers.el
+++ b/lisp/ediff-vers.el
@@ -1,7 +1,7 @@
 ;;; ediff-vers.el --- version control interface to Ediff
 
 ;; Copyright (C) 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff-wind.el b/lisp/ediff-wind.el
index 7d9daa6aac9..c9162129e01 100644
--- a/lisp/ediff-wind.el
+++ b/lisp/ediff-wind.el
@@ -1,7 +1,7 @@
 ;;; ediff-wind.el --- window manipulation utilities
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/ediff.el b/lisp/ediff.el
index 5327b0961d3..c5f5c48f8da 100644
--- a/lisp/ediff.el
+++ b/lisp/ediff.el
@@ -1,7 +1,7 @@
 ;;; ediff.el --- a comprehensive visual interface to diff & patch
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Created: February 2, 1994
@@ -922,10 +922,7 @@ If WIND-B is nil, use window next to WIND-A."
 ;;;###autoload
 (defun ediff-regions-wordwise (buffer-A buffer-B &optional startup-hooks)
   "Run Ediff on a pair of regions in specified buffers.
-Regions \(i.e., point and mark\) are assumed to be set in advance except
-for the second region in the case both regions are from the same buffer.
-In such a case the user is asked to interactively establish the second
-region.
+Regions \(i.e., point and mark\) can be set in advance or marked interactively.
 This function is effective only for relatively small regions, up to 200
 lines.  For large regions, use `ediff-regions-linewise'."
   (interactive
@@ -966,10 +963,7 @@ lines.  For large regions, use `ediff-regions-linewise'."
 ;;;###autoload
 (defun ediff-regions-linewise (buffer-A buffer-B &optional startup-hooks)
   "Run Ediff on a pair of regions in specified buffers.
-Regions \(i.e., point and mark\) are assumed to be set in advance except
-for the second region in the case both regions are from the same buffer.
-In such a case the user is asked to interactively establish the second
-region.
+Regions \(i.e., point and mark\) can be set in advance or marked interactively.
 Each region is enlarged to contain full lines.
 This function is effective for large regions, over 100-200
 lines.  For small regions, use `ediff-regions-wordwise'."
diff --git a/lisp/edmacro.el b/lisp/edmacro.el
index aa38151053d..5ef9e25b3f9 100644
--- a/lisp/edmacro.el
+++ b/lisp/edmacro.el
@@ -1,7 +1,7 @@
 ;;; edmacro.el --- keyboard macro editor
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Maintainer: Dave Gillespie <daveg@synaptics.com>
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index 39f08d51f18..9b35298c296 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -1,7 +1,7 @@
 ;;; ehelp.el --- bindings for electric-help mode
 
 ;; Copyright (C) 1986, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, extensions
diff --git a/lisp/electric.el b/lisp/electric.el
index ef4bff48c6f..f9699b29869 100644
--- a/lisp/electric.el
+++ b/lisp/electric.el
@@ -1,7 +1,7 @@
 ;;; electric.el --- window maker and Command loop for `electric' modes
 
 ;; Copyright (C) 1985, 1986, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index ef10be39623..dd211900345 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -1,7 +1,7 @@
 ;;; elide-head.el --- hide headers in files
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: outlines tools
diff --git a/lisp/emacs-lisp/advice.el b/lisp/emacs-lisp/advice.el
index f6037c065fe..fe4639cf01a 100644
--- a/lisp/emacs-lisp/advice.el
+++ b/lisp/emacs-lisp/advice.el
@@ -1,7 +1,7 @@
 ;;; advice.el --- an overloading mechanism for Emacs Lisp functions
 
 ;; Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/assoc.el b/lisp/emacs-lisp/assoc.el
index 1d710cceb48..e2ecc544214 100644
--- a/lisp/emacs-lisp/assoc.el
+++ b/lisp/emacs-lisp/assoc.el
@@ -1,7 +1,7 @@
 ;;; assoc.el --- insert/delete/sort functions on association lists
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Keywords: extensions
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index a19f054a468..5f70773444d 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -1,7 +1,7 @@
 ;;; authors.el --- utility for maintaining Emacs' AUTHORS file -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: Kim F. Storm <storm@cua.dk>
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index da85cbd817a..e6822d90ee2 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -1,7 +1,7 @@
 ;; autoload.el --- maintain autoloads in loaddefs.el
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Keywords: maint
diff --git a/lisp/emacs-lisp/backquote.el b/lisp/emacs-lisp/backquote.el
index c9f2a052b0b..766d8b38537 100644
--- a/lisp/emacs-lisp/backquote.el
+++ b/lisp/emacs-lisp/backquote.el
@@ -1,7 +1,7 @@
 ;;; backquote.el --- implement the ` Lisp construct
 
 ;; Copyright (C) 1990, 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rick Sladkey <jrs@world.std.com>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/benchmark.el b/lisp/emacs-lisp/benchmark.el
index d46c86b623b..2936dd84ef5 100644
--- a/lisp/emacs-lisp/benchmark.el
+++ b/lisp/emacs-lisp/benchmark.el
@@ -1,6 +1,6 @@
 ;;; benchmark.el --- support for benchmarking code
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Love  <fx@gnu.org>
 ;; Keywords: lisp, extensions
diff --git a/lisp/emacs-lisp/bindat.el b/lisp/emacs-lisp/bindat.el
index 6053fb3cf09..c58c286ef75 100644
--- a/lisp/emacs-lisp/bindat.el
+++ b/lisp/emacs-lisp/bindat.el
@@ -1,6 +1,6 @@
 ;;; bindat.el --- binary data structure packing and unpacking.
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Assignment name: struct.el
diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el
index 8c3fcffbc7d..dd7e042499c 100644
--- a/lisp/emacs-lisp/byte-opt.el
+++ b/lisp/emacs-lisp/byte-opt.el
@@ -1,7 +1,7 @@
 ;;; byte-opt.el --- the optimization passes of the emacs-lisp byte compiler
 
 ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 9c6da5f7b3c..84a4b39027d 100644
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -1,7 +1,7 @@
 ;;; byte-run.el --- byte-compiler support for inlining
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index 6790f199206..4b31a0e6943 100644
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -1,7 +1,7 @@
 ;;; bytecomp.el --- compilation of Lisp code into byte code
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;;	Hallvard Furuseth <hbf@ulrik.uio.no>
@@ -2002,7 +2002,8 @@ With argument, insert value in current buffer after the form."
 	  (print-length nil)
 	  (print-level nil)
 	  (print-quoted t)
-	  (print-gensym t))
+	  (print-gensym t)
+	  (print-circle t))	       ; handle circular data structures
       (princ "\n" outbuffer)
       (prin1 form outbuffer)
       nil)))
@@ -2059,6 +2060,7 @@ list that represents a doc string reference.
 	       ;; print-gensym-alist not to be cleared
 	       ;; between calls to print functions.
 	       (print-gensym '(t))
+	       (print-circle t)	       ; handle circular data structures
 	       print-gensym-alist    ; was used before print-circle existed.
 	       (print-continuous-numbering t)
 	       print-number-table
diff --git a/lisp/emacs-lisp/checkdoc.el b/lisp/emacs-lisp/checkdoc.el
index 0bacbf1c683..14b9ce55d9e 100644
--- a/lisp/emacs-lisp/checkdoc.el
+++ b/lisp/emacs-lisp/checkdoc.el
@@ -1,7 +1,7 @@
 ;;; checkdoc.el --- check documentation strings for style requirements
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Version: 0.6.2
diff --git a/lisp/emacs-lisp/cl-compat.el b/lisp/emacs-lisp/cl-compat.el
index 8b2c786ca04..c1f93e130e5 100644
--- a/lisp/emacs-lisp/cl-compat.el
+++ b/lisp/emacs-lisp/cl-compat.el
@@ -1,7 +1,7 @@
 ;;; cl-compat.el --- Common Lisp extensions for GNU Emacs Lisp (compatibility)
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 55c95b655d4..60c20e68b03 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -1,7 +1,7 @@
 ;;; cl-extra.el --- Common Lisp features, part 2 -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1993, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Keywords: extensions
diff --git a/lisp/emacs-lisp/cl-indent.el b/lisp/emacs-lisp/cl-indent.el
index f09b72f396f..7c15af60793 100644
--- a/lisp/emacs-lisp/cl-indent.el
+++ b/lisp/emacs-lisp/cl-indent.el
@@ -1,7 +1,7 @@
 ;;; cl-indent.el --- enhanced lisp-indent mode
 
 ;; Copyright (C) 1987, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Created: July 1987
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index ba556512532..adbe7054cda 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -1,6 +1,6 @@
 ;;; cl-macs.el --- Common Lisp macros -*-byte-compile-dynamic: t;-*-
 
-;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 11609d8a4ca..0027da1f9d2 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -1,7 +1,7 @@
 ;;; cl-seq.el --- Common Lisp features, part 3  -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
diff --git a/lisp/emacs-lisp/cl-specs.el b/lisp/emacs-lisp/cl-specs.el
index 644d0736d84..5ea587f953b 100644
--- a/lisp/emacs-lisp/cl-specs.el
+++ b/lisp/emacs-lisp/cl-specs.el
@@ -1,7 +1,7 @@
 ;;; cl-specs.el --- Edebug specs for cl.el -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Keywords: lisp, tools, maint
 
diff --git a/lisp/emacs-lisp/cl.el b/lisp/emacs-lisp/cl.el
index 0c9091e2128..83dffb41b2d 100644
--- a/lisp/emacs-lisp/cl.el
+++ b/lisp/emacs-lisp/cl.el
@@ -1,7 +1,7 @@
 ;;; cl.el --- Common Lisp extensions for Emacs -*-byte-compile-dynamic: t;-*-
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Gillespie <daveg@synaptics.com>
 ;; Version: 2.02
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el
index 4b5cbe51dd6..5f5aecea97a 100644
--- a/lisp/emacs-lisp/copyright.el
+++ b/lisp/emacs-lisp/copyright.el
@@ -1,7 +1,7 @@
 ;;; copyright.el --- update the copyright notice in current buffer
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: maint, tools
diff --git a/lisp/emacs-lisp/crm.el b/lisp/emacs-lisp/crm.el
index 6fd98583ccc..54fe21f9445 100644
--- a/lisp/emacs-lisp/crm.el
+++ b/lisp/emacs-lisp/crm.el
@@ -1,7 +1,7 @@
 ;;; crm.el --- read multiple strings with completion
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sen Nagata <sen@eccosys.com>
 ;; Keywords: completion, minibuffer, multiple elements
diff --git a/lisp/emacs-lisp/cust-print.el b/lisp/emacs-lisp/cust-print.el
index c38702c38f6..eeaa2154d3c 100644
--- a/lisp/emacs-lisp/cust-print.el
+++ b/lisp/emacs-lisp/cust-print.el
@@ -1,7 +1,7 @@
 ;;; cust-print.el --- handles print-level and print-circle
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Adapted-By: ESR
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 0c79a3eae9b..d8169fb5f2e 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -1,7 +1,7 @@
 ;;; debug.el --- debuggers and related commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, tools, maint
diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 8bb4e5f7643..2b2cffc5a35 100644
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -2,7 +2,7 @@
 ;; (formerly mode-clone.el)
 
 ;; Copyright (C) 1993, 1994, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Megginson (dmeggins@aix1.uottawa.ca)
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/disass.el b/lisp/emacs-lisp/disass.el
index db114e3cdf8..56370bc5c83 100644
--- a/lisp/emacs-lisp/disass.el
+++ b/lisp/emacs-lisp/disass.el
@@ -1,7 +1,7 @@
 ;;; disass.el --- disassembler for compiled Emacs Lisp code
 
 ;; Copyright (C) 1986, 1991, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Doug Cutting <doug@csli.stanford.edu>
 ;;	Jamie Zawinski <jwz@lucid.com>
diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 213854edb54..7c6a26e59d6 100644
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -1,7 +1,7 @@
 ;;; easy-mmode.el --- easy definition for major and minor modes
 
 ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Georges Brun-Cottan <Georges.Brun-Cottan@inria.fr>
 ;; Maintainer: Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/emacs-lisp/easymenu.el b/lisp/emacs-lisp/easymenu.el
index 06cafb17e61..d1ec5a1fe39 100644
--- a/lisp/emacs-lisp/easymenu.el
+++ b/lisp/emacs-lisp/easymenu.el
@@ -1,7 +1,7 @@
 ;;; easymenu.el --- support the easymenu interface for defining a menu
 
 ;; Copyright (C) 1994, 1996, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: emulations
 ;; Author: Richard Stallman <rms@gnu.org>
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index 5107ee60274..5af676a5e86 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -1,7 +1,7 @@
 ;;; edebug.el --- a source-level debugger for Emacs Lisp
 
 ;; Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1997, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 3bf34279b79..fd762e2968f 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -1,7 +1,7 @@
 ;;; eldoc.el --- show function arglist or variable docstring in echo area
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
 ;; Maintainer: friedman@splode.com
diff --git a/lisp/emacs-lisp/elint.el b/lisp/emacs-lisp/elint.el
index 124817427d6..d6ec46e3055 100644
--- a/lisp/emacs-lisp/elint.el
+++ b/lisp/emacs-lisp/elint.el
@@ -1,7 +1,7 @@
 ;;; elint.el --- Lint Emacs Lisp
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter Liljenberg <petli@lysator.liu.se>
 ;; Created: May 1997
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index da5fd6c760c..3855254db18 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -1,7 +1,7 @@
 ;;; elp.el --- Emacs Lisp Profiler
 
 ;; Copyright (C) 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index 0ffaf564ba4..3649757f782 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -1,7 +1,7 @@
 ;;; ewoc.el --- utility to maintain a view of a list of objects in a buffer
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Cederqvist <ceder@lysator.liu.se>
 ;;	Inge Wallin <inge@lysator.liu.se>
diff --git a/lisp/emacs-lisp/find-func.el b/lisp/emacs-lisp/find-func.el
index 35ba803d78e..07012a38f2e 100644
--- a/lisp/emacs-lisp/find-func.el
+++ b/lisp/emacs-lisp/find-func.el
@@ -1,7 +1,7 @@
 ;;; find-func.el --- find the definition of the Emacs Lisp function near point
 
 ;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jens Petersen <petersen@kurims.kyoto-u.ac.jp>
 ;; Maintainer: petersen@kurims.kyoto-u.ac.jp
diff --git a/lisp/emacs-lisp/find-gc.el b/lisp/emacs-lisp/find-gc.el
index 482a72eece2..0ed33dd44dc 100644
--- a/lisp/emacs-lisp/find-gc.el
+++ b/lisp/emacs-lisp/find-gc.el
@@ -1,7 +1,7 @@
 ;;; find-gc.el --- detect functions that call the garbage collector
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/emacs-lisp/float-sup.el b/lisp/emacs-lisp/float-sup.el
index dc630e72c92..6f24e9bb749 100644
--- a/lisp/emacs-lisp/float-sup.el
+++ b/lisp/emacs-lisp/float-sup.el
@@ -1,7 +1,7 @@
 ;;; float-sup.el --- define some constants useful for floating point numbers.
 
 ;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/emacs-lisp/generic.el b/lisp/emacs-lisp/generic.el
index b8f944ea8bc..22ed0c53175 100644
--- a/lisp/emacs-lisp/generic.el
+++ b/lisp/emacs-lisp/generic.el
@@ -1,7 +1,7 @@
 ;;; generic.el --- defining simple major modes with comment and font-lock
 ;;
 ;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Fri Sep 27 1996
diff --git a/lisp/emacs-lisp/gulp.el b/lisp/emacs-lisp/gulp.el
index 6fc2dba9273..ab95a0dab40 100644
--- a/lisp/emacs-lisp/gulp.el
+++ b/lisp/emacs-lisp/gulp.el
@@ -1,7 +1,7 @@
 ;;; gulp.el --- ask for updates for Lisp packages
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sam Shteingold <shteingd@math.ucla.edu>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/helper.el b/lisp/emacs-lisp/helper.el
index a7cf792a4ba..a14339f8f1d 100644
--- a/lisp/emacs-lisp/helper.el
+++ b/lisp/emacs-lisp/helper.el
@@ -1,7 +1,7 @@
 ;;; helper.el --- utility help package supporting help in electric modes
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/levents.el b/lisp/emacs-lisp/levents.el
index fa747ed3eb4..e409430064e 100644
--- a/lisp/emacs-lisp/levents.el
+++ b/lisp/emacs-lisp/levents.el
@@ -1,7 +1,7 @@
 ;;; levents.el --- emulate the Lucid event data type and associated functions
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
diff --git a/lisp/emacs-lisp/lisp-mnt.el b/lisp/emacs-lisp/lisp-mnt.el
index d83bf182e7a..74dd26cb02b 100644
--- a/lisp/emacs-lisp/lisp-mnt.el
+++ b/lisp/emacs-lisp/lisp-mnt.el
@@ -1,7 +1,7 @@
 ;;; lisp-mnt.el --- utility functions for Emacs Lisp maintainers
 
 ;; Copyright (C) 1992, 1994, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index a58ecb256ac..5aa656bd2b5 100644
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -1,7 +1,7 @@
 ;;; lisp-mode.el --- Lisp mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 1986, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
@@ -490,6 +490,8 @@ alternative printed representations that can be displayed."
 	      (point (point)))
 	  (delete-region beg end)
 	  (insert (nth 1 value))
+	  (or (= beg point)
+	      (setq point (1- (point))))
 	  (last-sexp-setup-props beg (point)
 				 (nth 0 value)
 				 (nth 2 value)
diff --git a/lisp/emacs-lisp/lisp.el b/lisp/emacs-lisp/lisp.el
index 895bec256d4..947b4063ad4 100644
--- a/lisp/emacs-lisp/lisp.el
+++ b/lisp/emacs-lisp/lisp.el
@@ -1,7 +1,7 @@
 ;;; lisp.el --- Lisp editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: lisp, languages
diff --git a/lisp/emacs-lisp/lmenu.el b/lisp/emacs-lisp/lmenu.el
index 0f6904356ae..b558ac58e27 100644
--- a/lisp/emacs-lisp/lmenu.el
+++ b/lisp/emacs-lisp/lmenu.el
@@ -1,7 +1,7 @@
 ;;; lmenu.el --- emulate Lucid's menubar support
 
 ;; Copyright (C) 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: emulations obsolete
 
diff --git a/lisp/emacs-lisp/lselect.el b/lisp/emacs-lisp/lselect.el
index 8b18d1a1123..3f54fa5ca95 100644
--- a/lisp/emacs-lisp/lselect.el
+++ b/lisp/emacs-lisp/lselect.el
@@ -1,7 +1,7 @@
 ;;; lselect.el --- Lucid interface to X Selections
 
 ;; Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
diff --git a/lisp/emacs-lisp/lucid.el b/lisp/emacs-lisp/lucid.el
index 81bdd13171e..375d7122a9e 100644
--- a/lisp/emacs-lisp/lucid.el
+++ b/lisp/emacs-lisp/lucid.el
@@ -1,7 +1,7 @@
 ;;; lucid.el --- emulate some Lucid Emacs functions
 
 ;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
diff --git a/lisp/emacs-lisp/macroexp.el b/lisp/emacs-lisp/macroexp.el
index 97a4d8c52c1..aaf887bd30c 100644
--- a/lisp/emacs-lisp/macroexp.el
+++ b/lisp/emacs-lisp/macroexp.el
@@ -1,6 +1,6 @@
 ;;; macroexp.el --- Additional macro-expansion support
 ;;
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: lisp, compiler, macros
diff --git a/lisp/emacs-lisp/map-ynp.el b/lisp/emacs-lisp/map-ynp.el
index 7b2dac6cd45..c40f1cf9b3a 100644
--- a/lisp/emacs-lisp/map-ynp.el
+++ b/lisp/emacs-lisp/map-ynp.el
@@ -1,7 +1,7 @@
 ;;; map-ynp.el --- general-purpose boolean question-asker
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 27cb936c598..66abfdf2c6d 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -1,7 +1,7 @@
 ;;; pp.el --- pretty printer for Emacs Lisp
 
 ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Randal Schwartz <merlyn@stonehenge.com>
 ;; Keywords: lisp
@@ -158,7 +158,7 @@ Ignores leading comment characters."
     (set-syntax-table stab)
     (if arg
 	(insert (pp-to-string (eval exp)))
-      (pp-eval-expression (eval exp)))))
+      (pp-eval-expression exp))))
 
 ;;; Test cases for quote
 ;; (pp-eval-expression ''(quote quote))
diff --git a/lisp/emacs-lisp/re-builder.el b/lisp/emacs-lisp/re-builder.el
index cae4be8addd..08897bec72c 100644
--- a/lisp/emacs-lisp/re-builder.el
+++ b/lisp/emacs-lisp/re-builder.el
@@ -1,7 +1,7 @@
 ;;; re-builder.el --- building Regexps with visual feedback
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Detlev Zundel <dzu@gnu.org>
 ;; Keywords: matching, lisp, tools
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 894ff1a8967..34cd97775dc 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -1,7 +1,7 @@
 ;;; regexp-opt.el --- generate efficient regexps to match strings
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/regi.el b/lisp/emacs-lisp/regi.el
index bc6c9983b19..208f06e00c1 100644
--- a/lisp/emacs-lisp/regi.el
+++ b/lisp/emacs-lisp/regi.el
@@ -1,7 +1,7 @@
 ;;; regi.el --- REGular expression Interpreting engine
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw, Century Computing, Inc. <bwarsaw@cen.com>
 ;; Maintainer:    bwarsaw@cen.com
diff --git a/lisp/emacs-lisp/ring.el b/lisp/emacs-lisp/ring.el
index f775513e961..a259d2ba514 100644
--- a/lisp/emacs-lisp/ring.el
+++ b/lisp/emacs-lisp/ring.el
@@ -1,7 +1,7 @@
 ;;; ring.el --- handle rings of items
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: extensions
diff --git a/lisp/emacs-lisp/rx.el b/lisp/emacs-lisp/rx.el
index 694544e3c52..39134443d86 100644
--- a/lisp/emacs-lisp/rx.el
+++ b/lisp/emacs-lisp/rx.el
@@ -1,7 +1,7 @@
 ;;; rx.el --- sexp notation for regular expressions
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el
index 98f3e30f10e..827ee9c4e6b 100644
--- a/lisp/emacs-lisp/shadow.el
+++ b/lisp/emacs-lisp/shadow.el
@@ -1,7 +1,7 @@
 ;;; shadow.el --- locate Emacs Lisp file shadowings
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Terry Jones <terry@santafe.edu>
 ;; Keywords: lisp
diff --git a/lisp/emacs-lisp/sregex.el b/lisp/emacs-lisp/sregex.el
index 5d37eb99859..447691d4046 100644
--- a/lisp/emacs-lisp/sregex.el
+++ b/lisp/emacs-lisp/sregex.el
@@ -1,7 +1,7 @@
 ;;; sregex.el --- symbolic regular expressions
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bob Glickstein <bobg+sregex@zanshin.com>
 ;; Maintainer: Bob Glickstein <bobg+sregex@zanshin.com>
diff --git a/lisp/emacs-lisp/syntax.el b/lisp/emacs-lisp/syntax.el
index 0937076a7f4..13087afcc61 100644
--- a/lisp/emacs-lisp/syntax.el
+++ b/lisp/emacs-lisp/syntax.el
@@ -1,7 +1,7 @@
 ;;; syntax.el --- helper functions to find syntactic context
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/emacs-lisp/tcover-ses.el b/lisp/emacs-lisp/tcover-ses.el
index 340096429d1..ad61ffde43d 100644
--- a/lisp/emacs-lisp/tcover-ses.el
+++ b/lisp/emacs-lisp/tcover-ses.el
@@ -1,6 +1,6 @@
 ;;;; testcover-ses.el -- Example use of `testcover' to test "SES"
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff --git a/lisp/emacs-lisp/tcover-unsafep.el b/lisp/emacs-lisp/tcover-unsafep.el
index 7390e6a830d..ed380c5de50 100644
--- a/lisp/emacs-lisp/tcover-unsafep.el
+++ b/lisp/emacs-lisp/tcover-unsafep.el
@@ -1,6 +1,6 @@
 ;;;; testcover-unsafep.el -- Use testcover to test unsafep's code coverage
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@engineer.com>
 ;; Maintainer: Jonathan Yavner <jyavner@engineer.com>
diff --git a/lisp/emacs-lisp/testcover.el b/lisp/emacs-lisp/testcover.el
index 4ee83cfdba2..d8c171e111d 100644
--- a/lisp/emacs-lisp/testcover.el
+++ b/lisp/emacs-lisp/testcover.el
@@ -1,6 +1,6 @@
 ;;;; testcover.el -- Visual code-coverage tool
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/emacs-lisp/timer.el b/lisp/emacs-lisp/timer.el
index 4ad4dac1d58..db6586838bb 100644
--- a/lisp/emacs-lisp/timer.el
+++ b/lisp/emacs-lisp/timer.el
@@ -1,7 +1,7 @@
 ;;; timer.el --- run a function with args at some time in future
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/emacs-lisp/tq.el b/lisp/emacs-lisp/tq.el
index 7c4303b5b79..b12c21b6730 100644
--- a/lisp/emacs-lisp/tq.el
+++ b/lisp/emacs-lisp/tq.el
@@ -1,7 +1,7 @@
 ;;; tq.el --- utility to maintain a transaction queue
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Scott Draves <spot@cs.cmu.edu>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/trace.el b/lisp/emacs-lisp/trace.el
index 5250a34b3fd..87c4a409507 100644
--- a/lisp/emacs-lisp/trace.el
+++ b/lisp/emacs-lisp/trace.el
@@ -1,7 +1,7 @@
 ;;; trace.el --- tracing facility for Emacs Lisp functions
 
 ;; Copyright (C) 1993, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Hans Chalupsky <hans@cs.buffalo.edu>
 ;; Maintainer: FSF
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index aeaf653aef6..00e51f09bad 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -1,6 +1,6 @@
 ;;;; unsafep.el -- Determine whether a Lisp form is safe to evaluate
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index a02a8c14eba..b75f0fd242f 100644
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -1,6 +1,6 @@
 ;;; warnings.el --- log and display warnings
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index f0655c306b9..dc93f093f9e 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -1,7 +1,7 @@
 ;;; emacs-lock.el --- prevents you from exiting Emacs if a buffer is locked
 
 ;; Copyright (C) 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc
+;;   2005, 2006, 2007 Free Software Foundation, Inc
 
 ;; Author: Tom Wurgler <twurgler@goodyear.com>
 ;; Created: 12/8/94
diff --git a/lisp/emulation/crisp.el b/lisp/emulation/crisp.el
index 0d629d69235..106eff8e631 100644
--- a/lisp/emulation/crisp.el
+++ b/lisp/emulation/crisp.el
@@ -1,7 +1,7 @@
 ;;; crisp.el --- CRiSP/Brief Emacs emulator
 
 ;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@Corp.Sun.COM>
 ;; Keywords: emulations brief crisp
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 194b7e2c326..a733eadfaad 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1,7 +1,7 @@
 ;;; cua-base.el --- emulate CUA key bindings
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulation convenience cua
@@ -399,6 +399,9 @@ and after the region marked by the rectangle to search."
 		 (other :tag "Enabled" t))
   :group 'cua)
 
+(defvar cua-global-keymap)		; forward
+(defvar cua--region-keymap)		; forward
+
 (defcustom cua-rectangle-mark-key [(control return)]
   "Global key used to toggle the cua rectangle mark."
   :set #'(lambda (symbol value)
diff --git a/lisp/emulation/cua-gmrk.el b/lisp/emulation/cua-gmrk.el
index 842ee9ce0e3..9f4469eff0f 100644
--- a/lisp/emulation/cua-gmrk.el
+++ b/lisp/emulation/cua-gmrk.el
@@ -1,7 +1,7 @@
 ;;; cua-gmrk.el --- CUA unified global mark support
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience cua mark
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 7db3cca8fae..7735302339f 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1,7 +1,7 @@
 ;;; cua-rect.el --- CUA unified rectangle support
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard emulations convenience CUA
diff --git a/lisp/emulation/edt-lk201.el b/lisp/emulation/edt-lk201.el
index f7bca958b72..54cb1b763e0 100644
--- a/lisp/emulation/edt-lk201.el
+++ b/lisp/emulation/edt-lk201.el
@@ -1,7 +1,7 @@
 ;;; edt-lk201.el --- enhanced EDT keypad mode emulation for LK-201 keyboards
 
 ;; Copyright (C) 1986, 1992, 1993, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt-mapper.el b/lisp/emulation/edt-mapper.el
index 53bb8e63d33..deae60a9714 100644
--- a/lisp/emulation/edt-mapper.el
+++ b/lisp/emulation/edt-mapper.el
@@ -1,7 +1,7 @@
 ;;; edt-mapper.el --- create an EDT LK-201 map file for X-Windows Emacs
 
 ;; Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt-pc.el b/lisp/emulation/edt-pc.el
index 1282e940d9c..309f03615cf 100644
--- a/lisp/emulation/edt-pc.el
+++ b/lisp/emulation/edt-pc.el
@@ -1,7 +1,7 @@
 ;;; edt-pc.el --- enhanced EDT keypad mode emulation for PC 101 keyboards
 
 ;; Copyright (C) 1986, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt-vt100.el b/lisp/emulation/edt-vt100.el
index cd3e03885eb..e6321ddc2ce 100644
--- a/lisp/emulation/edt-vt100.el
+++ b/lisp/emulation/edt-vt100.el
@@ -1,7 +1,7 @@
 ;;; edt-vt100.el --- enhanced EDT keypad mode emulation for VT series terminals
 
 ;; Copyright (C) 1986, 1992, 1993, 1995, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/edt.el b/lisp/emulation/edt.el
index 89d017a1cad..45e26a1e23e 100644
--- a/lisp/emulation/edt.el
+++ b/lisp/emulation/edt.el
@@ -1,7 +1,7 @@
 ;;; edt.el --- enhanced EDT keypad mode emulation for GNU Emacs 19
 
 ;; Copyright (C) 1986, 1992, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallagher <Kevin.Gallagher@boeing.com>
 ;; Maintainer: Kevin Gallagher <Kevin.Gallagher@boeing.com>
diff --git a/lisp/emulation/keypad.el b/lisp/emulation/keypad.el
index 5009ae86d65..28054c2dcb3 100644
--- a/lisp/emulation/keypad.el
+++ b/lisp/emulation/keypad.el
@@ -1,7 +1,7 @@
 ;;; keypad.el --- simplified keypad bindings
 
-;; Copyright (C) 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
+;;   2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
@@ -194,9 +194,9 @@ decimal key must be specified."
 
 ;;;###autoload
 (defun keypad-setup (setup &optional numlock shift decimal)
-  "Set keypad bindings in function-key-map according to SETUP.
+  "Set keypad bindings in `function-key-map' according to SETUP.
 If optional second argument NUMLOCK is non-nil, the NumLock On bindings
-are changed. Otherwise, the NumLock Off bindings are changed.
+are changed.  Otherwise, the NumLock Off bindings are changed.
 If optional third argument SHIFT is non-nil, the shifted keypad
 keys are bound.
 
diff --git a/lisp/emulation/pc-mode.el b/lisp/emulation/pc-mode.el
index af632694bd0..ce58205ba93 100644
--- a/lisp/emulation/pc-mode.el
+++ b/lisp/emulation/pc-mode.el
@@ -1,7 +1,7 @@
 ;;; pc-mode.el --- emulate certain key bindings used on PCs
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: emulations
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index bc048fd46d1..d6f7fdc2cc1 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -3,7 +3,7 @@
 ;;;		     including key bindings.
 
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Staats <michael@thp.Uni-Duisburg.DE>
 ;; Keywords: convenience emulation
diff --git a/lisp/emulation/tpu-edt.el b/lisp/emulation/tpu-edt.el
index b848f45d7d8..f6e00cbbea6 100644
--- a/lisp/emulation/tpu-edt.el
+++ b/lisp/emulation/tpu-edt.el
@@ -1,7 +1,7 @@
 ;;; tpu-edt.el --- Emacs emulating TPU emulating EDT
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index 2a84e5ff7d5..e368d7b963f 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -1,7 +1,7 @@
 ;;; tpu-extras.el --- scroll margins and free cursor mode for TPU-edt
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/tpu-mapper.el b/lisp/emulation/tpu-mapper.el
index 349a03fc8eb..975e61c8df3 100644
--- a/lisp/emulation/tpu-mapper.el
+++ b/lisp/emulation/tpu-mapper.el
@@ -1,7 +1,7 @@
 ;;; tpu-mapper.el --- create a TPU-edt X-windows keymap file
 
 ;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/emulation/vip.el b/lisp/emulation/vip.el
index 16db3988c5b..33cabd73ca7 100644
--- a/lisp/emulation/vip.el
+++ b/lisp/emulation/vip.el
@@ -1,7 +1,7 @@
 ;;; vip.el --- a VI Package for GNU Emacs
 
 ;; Copyright (C) 1986, 1987, 1988, 1992, 1993, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masahiko Sato <ms@sail.stanford.edu>
 ;; Keywords: emulations
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index d3dae72d13e..9bd1654020b 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -1,7 +1,7 @@
 ;;; viper-cmd.el --- Vi command support for Viper
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper-ex.el b/lisp/emulation/viper-ex.el
index 9f69c685948..447ee62533c 100644
--- a/lisp/emulation/viper-ex.el
+++ b/lisp/emulation/viper-ex.el
@@ -1,7 +1,7 @@
 ;;; viper-ex.el --- functions implementing the Ex commands for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper-init.el b/lisp/emulation/viper-init.el
index bf85d282fed..86e0e044641 100644
--- a/lisp/emulation/viper-init.el
+++ b/lisp/emulation/viper-init.el
@@ -1,7 +1,7 @@
 ;;; viper-init.el --- some common definitions for Viper
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper-keym.el b/lisp/emulation/viper-keym.el
index 8eeb5b4f3fc..9dd78ce8aa1 100644
--- a/lisp/emulation/viper-keym.el
+++ b/lisp/emulation/viper-keym.el
@@ -1,7 +1,7 @@
 ;;; viper-keym.el --- Viper keymaps
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
@@ -308,8 +308,6 @@ If running in a terminal, [(escape)] is not understood, so must use \"\\e\"."
 (define-key viper-insert-basic-map "\C-d" 'viper-backward-indent)
 (define-key viper-insert-basic-map "\C-w" 'viper-delete-backward-word)
 (define-key viper-insert-basic-map "\C-t" 'viper-forward-indent)
-(define-key viper-insert-basic-map
-  (if viper-xemacs-p [(shift tab)] [S-tab]) 'viper-insert-tab)
 (define-key viper-insert-basic-map viper-quoted-insert-key 'quoted-insert)
 (define-key viper-insert-basic-map "\C-?" 'viper-del-backward-char-in-insert)
 (define-key viper-insert-basic-map [backspace] 'viper-del-backward-char-in-insert)
diff --git a/lisp/emulation/viper-macs.el b/lisp/emulation/viper-macs.el
index 1cd1ce1f627..5bd43a29a0c 100644
--- a/lisp/emulation/viper-macs.el
+++ b/lisp/emulation/viper-macs.el
@@ -1,7 +1,7 @@
 ;;; viper-macs.el --- functions implementing keyboard macros for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper-mous.el b/lisp/emulation/viper-mous.el
index 7670e3226db..59a83a076b6 100644
--- a/lisp/emulation/viper-mous.el
+++ b/lisp/emulation/viper-mous.el
@@ -1,7 +1,7 @@
 ;;; viper-mous.el --- mouse support for Viper
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper-util.el b/lisp/emulation/viper-util.el
index fe179be9cd1..0419af5fedf 100644
--- a/lisp/emulation/viper-util.el
+++ b/lisp/emulation/viper-util.el
@@ -1,7 +1,7 @@
 ;;; viper-util.el --- Utilities used by viper.el
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 
diff --git a/lisp/emulation/viper.el b/lisp/emulation/viper.el
index 4173856fdd1..ddd37b16cc2 100644
--- a/lisp/emulation/viper.el
+++ b/lisp/emulation/viper.el
@@ -4,7 +4,7 @@
 ;;		 Viper Is also a Package for Emacs Rebels.
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
 ;; Keywords: emulations
@@ -532,7 +532,7 @@ If Viper is enabled, turn it off.  Otherwise, turn it on."
 
 ;;;###autoload
 (defun viper-mode ()
-  "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Viper'."
+  "Turn on Viper emulation of Vi in Emacs. See Info node `(viper)Top'."
   (interactive)
   (if (not noninteractive)
       (progn
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index a4a1575f629..3df3a7333a1 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -1,7 +1,7 @@
 ;;; ws-mode.el --- WordStar emulation mode for GNU Emacs
 
 ;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Juergen Nickelsen <nickel@cs.tu-berlin.de>
 ;; Version: 0.7
diff --git a/lisp/env.el b/lisp/env.el
index 96ff1f37c3a..33d4287312f 100644
--- a/lisp/env.el
+++ b/lisp/env.el
@@ -1,7 +1,7 @@
 ;;; env.el --- functions to manipulate environment variables
 
 ;; Copyright (C) 1991, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: processes, unix
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index fa087fb513f..f47e7d798c5 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,94 @@
+2007-01-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-command-regexp): New variable that is used to match
+	a command.
+	(erc-send-input): Use it.  This fixes a bug where paths --
+	"/usr/bin/foo", for example -- were being displayed as commands,
+	but still sent correctly.
+	(erc-extract-command-from-line): Use it.
+
+	* erc.texi (Modules): Document erc-capab-identify.
+
+2007-01-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-find-parsed-property): Moved here from erc-track.el
+	since it can be useful in general.
+
+	* erc-track.el (erc-find-parsed-property): Removed.
+
+	* erc-capab.el (erc-capab-find-parsed): Removed.
+	(erc-capab-identify-add-prefix): Use `erc-find-parsed-property'.
+
+	* erc.el (erc-open): Run `erc-before-connect' hook here.  This
+	makes sure the hook always gets called before a connection is
+	made, as some functions, like `erc-handle-irc-url', use `erc-open'
+	instead of `erc'.
+	(erc): Removed `erc-before-connect' hook.
+
+	* erc-menu.el (erc-menu-definition): Put items specific to
+	channels in a "Current channel" submenu.
+
+	* erc-backend.el (321, 323): Display channel list in server buffer
+	when not using the channel list module.
+
+	* erc.el: Updated copyright years.
+	(erc-version-string): Set to 5.2 (devel).
+	(erc-format-lag-time): Fixed to work when `erc-server-lag' is nil.
+	(erc-update-mode-line-buffer): Set the header face.
+
+2007-01-11  Michael Olson  <mwolson@gnu.org>
+
+	* erc-bbdb.el (erc-bbdb-popup-type): Fix customization type and
+	documentation.
+
+	* erc-services.el (erc-nickserv-identify-mode): Improve
+	documentation for nick-change option and move higher to fix
+	compiler warning.  Avoid a recursive load error.
+	(erc-nickserv-alist): Add simple entry for BitlBee, to avoid
+	"NickServ is AWAY: User is offline" error.  Oddly enough, bitlbee
+	was smart enough to recognize that as an authentication request
+	and log in regardless, which is why I didn't notice this earlier.
+	(erc-nickserv-alist-sender, erc-nickserv-alist-regexp)
+	(erc-nickserv-alist-nickserv, erc-nickserv-alist-ident-keyword)
+	(erc-nickserv-alist-use-nick-p)
+	(erc-nickserv-alist-ident-command): New accessors for
+	erc-nickserv-alist.  Using nth is unwieldy.
+	(erc-nickserv-identify-autodetect)
+	(erc-nickserv-identify-on-connect)
+	(erc-nickserv-identify-on-nick-change, erc-nickserv-identify): Use
+	the new accessors.
+
+2007-01-11  Diane Murray  <disumu@x3y2z1.net>
+
+	* NEWS: Added note for `erc-my-nick-face'.  Fixed capab-identify
+	wording.
+
+2007-01-10  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc.el (erc-mode-line-format): Added %l to documentation.
+	(erc-header-line-format): Removed "[IRC]".  Use the new %l
+	replacement character.  Doc fix.
+	(erc-format-channel-modes): Removed lag code.  Removed parentheses
+	from mode string.
+	(erc-format-lag-time): New function.
+	(erc-update-mode-line-buffer): Use it.
+
+2007-01-09  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-system-name): New option that determines the system
+	name to use when logging in.  The default is to figure this out by
+	calling `system-name'.
+	(erc-login): Use it.
+
+2007-01-07  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-modules): Add the menu module.  This should fix a
+	bug with incorrect ERC submenus being displayed.
+
+	* erc-menu.el: Turn this into a module.
+	(erc-menu-add, erc-menu-remove): New functions that add and remove
+	the ERC menu.
+
 2006-12-28  Michael Olson  <mwolson@gnu.org>
 
 	* erc-list.el: Change header to mention that this is part of ERC,
@@ -296,6 +387,16 @@
 	(erc-make-mode-line-buffer-name): Add help-echo and mouse-face
 	properties to channel name.
 
+2006-08-20  Michael Olson  <mwolson@gnu.org>
+
+	* erc.el (erc-with-server-buffer): New macro that switches to the
+	current ERC server buffer and runs some code.  If no server buffer
+	is available, return nil.  This is a useful way to access
+	variables in the server buffer.
+	(erc-open-server-buffer-p): New function that returns non-nil if
+	the given buffer is an ERC server buffer that has an open IRC
+	process.
+
 2006-08-14  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc-menu.el: Updated copyright years.  Removed EmacsWiki URL.
@@ -645,8 +746,30 @@
 	<C-tab> for `erc-button-previous' as it is a more standard key
 	binding for this type of function.
 
+2006-02-28  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el: Removed things that were accidentally committed on
+	2006-02-20.  Removed Todo section.
+	(erc-capab-unidentified): Removed.
+
+2006-02-26  Michael Olson  <mwolson@gnu.org>
+
+	* erc-capab.el: Use (eval-when-compile (require 'cl)).
+	(erc-capab-unidentified): Fix compiler warning by specifying
+	group.
+
+2006-02-20  Diane Murray  <disumu@x3y2z1.net>
+
+	* erc-capab.el (erc-capab-send-identify-messages): Fixed comment
+	to explain thoughts better.  `erc-server-parameters' is an
+	associated list when it's set, not a string.
+
 2006-02-19  Michael Olson  <mwolson@gnu.org>
 
+	* erc-capab.el (erc-capab-send-identify-messages): Make sure some
+	parameters are strings before using them.  Thanks to Alejandro
+	Benitez for the report.
+
 	* erc.el (erc-version-string): Release ERC 5.1.2.
 
 2006-02-19  Diane Murray  <disumu@x3y2z1.net>
@@ -696,8 +819,13 @@
 
 2006-02-11  Michael Olson  <mwolson@gnu.org>
 
-	* erc.el (erc-update-modules): Make some requirements shorter, so
-	that it's easier to see why they are needed.
+	* erc.el (erc-update-modules): Handle erc-capab-identify
+	correctly.  Make some requirements shorter, so that it's easier to
+	see why they are needed.
+
+	* erc-capab.el: Add autoload cookie for capab-identify.
+	(erc-capab-send-identify-messages, erc-capab-identify-activate):
+	Minor whitespace fix in code.
 
 	* erc-stamp.el (erc-timestamp-use-align-to): Renamed from
 	`erc-timestamp-right-align-by-pixel'.  Set the default based on
@@ -721,11 +849,21 @@
 	(erc-list-channels): Was `erc-cmd-LIST', renamed.
 	(erc-list-channels-simple): New function.
 
-	* erc.el (erc-modules): Added `list' to enabled modules.  Moved
-	customization options left in source code.
+	* erc.el (erc-modules): Added `list' to enabled modules.  Changed
+	`capab-identify' description.  Moved customization options left in
+	source code.
 
 	* erc-menu.el (erc-menu-definition): Use `erc-list-channels'.
 
+	* erc-capab.el: Put a little more detail into Usage section.
+	(define-erc-module): Run `erc-capab-identify-setup' in all open
+	server buffers when enabling.
+	(erc-capab-identify-setup): Make PROC and PARSED optional
+	arguments.
+	(erc-capab-identify-add-prefix): Simplified nickname regexp.  This
+	should now also match nicknames that are formatted differently
+	than the default.
+
 	* erc-spelling.el (define-erc-module): Make sure there's a buffer
 	before calling `with-current-buffer'.
 
@@ -742,12 +880,34 @@
 2006-02-09  Diane Murray  <disumu@x3y2z1.net>
 
 	* erc.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
+	* erc-capab.el: Require erc.
+	(erc-capab-send-identify-messages): Use `erc-server-send'.
+	(erc-capab-identify-remove/set-identified-flag): Use 1 and 0 as
+	the flags so we can also check whether the `erc-identified' text
+	property is there at all.
+	(erc-capab-identify-add-prefix): Use `erc-capab-find-parsed'.
+	This fixes a bug where the prefix wasn't inserted when timestamps
+	are inserted on the right.  Tweaked nickname regexp.
+	(erc-capab-find-parsed): New function.
+	(erc-capab-get-unidentified-nickname): Updated to check for 0
+	flag.  Only get nickname if there's a nickuserhost associated with
+	this message.
+
+	* erc-capab.el: New file.  Adds the new module
+	`erc-capab-identify', which allows flagging of unidentified users
+	on servers running an ircd based on dancer - irc.freenode.net, for
+	example.
+
+	* erc.el (erc-modules): Added `capab-identify' to options.
+	(erc-get-parsed-vector, erc-get-parsed-vector-nick)
 	(erc-get-parsed-vector-type): Moved here from erc-match.el.
 
 	* erc-match.el (erc-get-parsed-vector, erc-get-parsed-vector-nick)
 	(erc-get-parsed-vector-type): Moved these functions to erc.el
 	since they can be useful outside of the text matching module.
 
+	* NEWS: Added erc-capab.el.
+
 	* erc-dcc.el, erc-stamp.el, erc-xdcc.el: Changed "Emacs IRC Client"
 	to "ERC".
 
@@ -1182,7 +1342,7 @@
 
 See ChangeLog.05 for earlier changes.
 
-    Copyright (C) 2006 Free Software Foundation, Inc.
+    Copyright (C) 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.01 b/lisp/erc/ChangeLog.01
index 25f57569742..fd0be8bbb8f 100644
--- a/lisp/erc/ChangeLog.01
+++ b/lisp/erc/ChangeLog.01
@@ -1035,7 +1035,7 @@
 
 	* erc-speak.el, erc.el: New file.
 
-    Copyright (C) 2001, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.02 b/lisp/erc/ChangeLog.02
index 332bd7fbfb9..eaa94c1c1ed 100644
--- a/lisp/erc/ChangeLog.02
+++ b/lisp/erc/ChangeLog.02
@@ -2596,7 +2596,7 @@
 
 See ChangeLog.01 for earlier changes.
 
-    Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2002, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.03 b/lisp/erc/ChangeLog.03
index 20f0f92f5e0..ed3b4e24b7b 100644
--- a/lisp/erc/ChangeLog.03
+++ b/lisp/erc/ChangeLog.03
@@ -2140,7 +2140,7 @@
 
 See ChangeLog.02 for earlier changes.
 
-    Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.04 b/lisp/erc/ChangeLog.04
index c5338a311c9..61af66db2ad 100644
--- a/lisp/erc/ChangeLog.04
+++ b/lisp/erc/ChangeLog.04
@@ -2069,7 +2069,7 @@
 
 See ChangeLog.03 for earlier changes.
 
-    Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/ChangeLog.05 b/lisp/erc/ChangeLog.05
index a640aba00a1..6f3207bb475 100644
--- a/lisp/erc/ChangeLog.05
+++ b/lisp/erc/ChangeLog.05
@@ -1217,7 +1217,7 @@
 
 See ChangeLog.04 for earlier changes.
 
-    Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/erc/erc-autoaway.el b/lisp/erc/erc-autoaway.el
index dcb6bc0756e..9d90d0ae5e9 100644
--- a/lisp/erc/erc-autoaway.el
+++ b/lisp/erc/erc-autoaway.el
@@ -1,6 +1,6 @@
 ;;; erc-autoaway.el --- Provides autoaway for ERC
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcAutoAway
diff --git a/lisp/erc/erc-backend.el b/lisp/erc/erc-backend.el
index c589ae282a6..fbe6f22e1d6 100644
--- a/lisp/erc/erc-backend.el
+++ b/lisp/erc/erc-backend.el
@@ -1,6 +1,6 @@
 ;;; erc-backend.el --- Backend network communication for ERC
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Filename: erc-backend.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
@@ -1535,7 +1535,7 @@ See `erc-display-server-message'." nil
 (define-erc-response-handler (321)
   "LIST header." nil
   (setq erc-channel-list nil)
-  (erc-display-message parsed 'notice 'active 's321))
+  (erc-display-message parsed 'notice proc 's321))
 
 (define-erc-response-handler (322)
   "LIST notice." nil
@@ -1545,7 +1545,7 @@ See `erc-display-server-message'." nil
       (add-to-list 'erc-channel-list (list channel))
       (erc-update-channel-topic channel topic)
       (erc-display-message
-       parsed 'notice 'active 's322
+       parsed 'notice proc 's322
        ?c channel ?u num-users ?t (or topic "")))))
 
 (define-erc-response-handler (324)
diff --git a/lisp/erc/erc-button.el b/lisp/erc/erc-button.el
index 13e2a384735..1fd224fb956 100644
--- a/lisp/erc/erc-button.el
+++ b/lisp/erc/erc-button.el
@@ -1,7 +1,7 @@
 ;; erc-button.el --- A way of buttonizing certain things in ERC buffers
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: irc, button, url, regexp
diff --git a/lisp/erc/erc-capab.el b/lisp/erc/erc-capab.el
new file mode 100644
index 00000000000..268c4bfe68a
--- /dev/null
+++ b/lisp/erc/erc-capab.el
@@ -0,0 +1,202 @@
+;;; erc-capab.el --- support for dancer-ircd and hyperion's CAPAB
+
+;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+
+;; GNU Emacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with GNU Emacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Commentary:
+
+;; This file defines the ERC module `erc-capab-identify', which allows
+;; flagging of unidentified users on servers running dancer-ircd or
+;; hyperion.  freenode.net supports this capability, for example.
+
+;; With CAPAB IDENTIFY-MSG and IDENTIFY-CTCP enabled, messages from
+;; users who have identified themselves to NickServ will have a plus
+;; sign and messages from unidentified users will have a minus sign
+;; added as a prefix.  Note that it is not necessary for your nickname
+;; to be identified in order to receive these marked messages.
+
+;; The plus or minus sign is removed from the message, and a prefix,
+;; `erc-capab-identify-prefix', is inserted in the front of the user's
+;; nickname if the nickname is not identified.
+
+;; Please note that once this has been enabled on a server, there is no
+;; way to tell the server to stop sending marked messages.  If you
+;; disable this module, it will continue removing message flags, but the
+;; unidentified nickname prefix will not be added to messages.
+
+;; Visit <http://freenode.net/faq.shtml#spoofing> and
+;; <http://freenode.net/faq.shtml#registering> to find further
+;; explanations of this capability.
+
+;; From freenode.net's web site (not there anymore) on how to mark
+;; unidentified users:
+;; "We recommend that you add an asterisk before the nick, and
+;;  optionally either highlight or colourize the line in some
+;;  appropriate fashion, if the user is not identified."
+
+;;; Usage:
+
+;; Put the following in your ~/.emacs file.
+
+;; (require 'erc-capab)
+;; (erc-capab-identify-mode 1)
+
+;; `erc-capab-identify-prefix' will now be added to the beginning of
+;; unidentified users' nicknames.  The default is an asterisk, "*".  If
+;; the value of this variable is nil or you disable this module (see
+;; `erc-capab-identify-disable'), no prefix will be inserted, but the
+;; flag sent by the server will still be stripped.
+
+;;; Code:
+
+(require 'erc)
+(eval-when-compile (require 'cl))
+
+;;; Customization:
+
+(defgroup erc-capab nil
+  "Support for dancer-ircd's CAPAB settings."
+  :group 'erc)
+
+(defcustom erc-capab-identify-prefix "*"
+  "The prefix used for unidentified users."
+  :group 'erc-capab
+  :type '(choice string (const nil)))
+
+;;; Define module:
+
+(define-erc-response-handler (290)
+  "Handle dancer-ircd CAPAB messages." nil nil)
+
+;;;###autoload (autoload 'erc-capab-identify-mode "erc-capab" nil t)
+(define-erc-module capab-identify nil
+  "Handle dancer-ircd's CAPAB IDENTIFY-MSG and IDENTIFY-CTCP."
+  ;; append so that `erc-server-parameters' is already set by `erc-server-005'
+  ((add-hook 'erc-server-005-functions 'erc-capab-identify-setup t)
+   (add-hook 'erc-server-290-functions 'erc-capab-identify-activate)
+   (add-hook 'erc-server-PRIVMSG-functions
+             'erc-capab-identify-remove/set-identified-flag)
+   (add-hook 'erc-server-NOTICE-functions
+             'erc-capab-identify-remove/set-identified-flag)
+   (add-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix t)
+   (mapc (lambda (buffer)
+           (when buffer
+             (with-current-buffer buffer (erc-capab-identify-setup))))
+         (erc-buffer-list 'erc-open-server-buffer-p)))
+  ((remove-hook 'erc-server-005-functions 'erc-capab-identify-setup)
+   (remove-hook 'erc-server-290-functions 'erc-capab-identify-activate)
+   ;; we don't remove the `erc-capab-identify-remove/set-identified-flag' hooks
+   ;; because there doesn't seem to be a way to tell the server to turn it off
+   (remove-hook 'erc-insert-modify-hook 'erc-capab-identify-add-prefix)))
+
+;;; Variables:
+
+(defvar erc-capab-identify-activated nil
+  "CAPAB IDENTIFY-MSG has been activated.")
+(make-variable-buffer-local 'erc-capab-identify-activated)
+
+(defvar erc-capab-identify-sent nil
+  "CAPAB IDENTIFY-MSG and IDENTIFY-CTCP messages have been sent.")
+(make-variable-buffer-local 'erc-capab-identify-sent)
+
+;;; Functions:
+
+(defun erc-capab-identify-setup (&optional proc parsed)
+  "Set up CAPAB IDENTIFY on the current server.
+
+Optional argument PROC is the current server's process.
+Optional argument PARSED is the current message, a response struct.
+
+These arguments are sent to this function when called as a hook in
+`erc-server-005-functions'."
+  (unless erc-capab-identify-sent
+    (erc-capab-send-identify-messages)))
+
+(defun erc-capab-send-identify-messages ()
+  "Send CAPAB IDENTIFY messages if the server supports it."
+  (when (and (stringp erc-server-version)
+             (string-match "^\\(dancer-ircd\\|hyperion\\)" erc-server-version)
+             ;; could possibly check for '("IRCD" . "dancer") in
+             ;; `erc-server-parameters' instead of looking for a specific name
+             ;; in `erc-server-version'
+             (assoc "CAPAB" erc-server-parameters))
+    (erc-log "Sending CAPAB IDENTIFY-MSG and IDENTIFY-CTCP")
+    (erc-server-send "CAPAB IDENTIFY-MSG")
+    (erc-server-send "CAPAB IDENTIFY-CTCP")
+    (setq erc-capab-identify-sent t)))
+
+
+(defun erc-capab-identify-activate (proc parsed)
+  "Set `erc-capab-identify-activated' and display an activation message.
+
+PROC is the current server's process.
+PARSED is an `erc-parsed' response struct."
+  (when (or (string= "IDENTIFY-MSG" (erc-response.contents parsed))
+            (string= "IDENTIFY-CTCP" (erc-response.contents parsed)))
+    (setq erc-capab-identify-activated t)
+    (erc-display-message
+     parsed 'notice 'active (format "%s activated"
+                                    (erc-response.contents parsed)))))
+
+(defun erc-capab-identify-remove/set-identified-flag (proc parsed)
+  "Remove PARSED message's id flag and add the `erc-identified' text property.
+
+PROC is the current server's process.
+PARSED is an `erc-parsed' response struct."
+  (let ((msg (erc-response.contents parsed)))
+    (when (and erc-capab-identify-activated
+               (string-match "^\\([-\\+]\\)\\(.+\\)$" msg))
+      (setf (erc-response.contents parsed)
+            (if erc-capab-identify-mode
+                (erc-propertize (match-string 2 msg)
+                                'erc-identified
+                                (if (string= (match-string 1 msg) "+")
+                                    1
+                                  0))
+              (match-string 2 msg)))
+      nil)))
+
+(defun erc-capab-identify-add-prefix ()
+  "Add `erc-capab-identify-prefix' to nickname if user is unidentified."
+  (when (and erc-capab-identify-prefix
+             (erc-with-server-buffer erc-capab-identify-activated))
+    (goto-char (or (erc-find-parsed-property) (point-min)))
+    (let ((nickname (erc-capab-get-unidentified-nickname
+                     (erc-get-parsed-vector (point)))))
+      (when (and nickname
+                 (goto-char (point-min))
+                 ;; assuming the first use of `nickname' is the sender's nick
+                 (re-search-forward (regexp-quote nickname) nil t))
+        (goto-char (match-beginning 0))
+        (insert (erc-propertize erc-capab-identify-prefix
+                                'face (get-char-property (- (point) 1)
+                                                         'face)))))))
+
+(defun erc-capab-get-unidentified-nickname (parsed)
+  "Return the nickname of the user if unidentified.
+PARSED is an `erc-parsed' response struct."
+  (when (and (erc-response-p parsed)
+             (equal 0 (get-text-property 0 'erc-identified
+                                     (erc-response.contents parsed))))
+    (let ((nickuserhost (erc-get-parsed-vector-nick parsed)))
+      (when nickuserhost
+       (nth 0 (erc-parse-user nickuserhost))))))
+
+(provide 'erc-capab)
+
+;; arch-tag: 27b6d668-7ee5-4e47-b9f0-27d7a4362062
+;;; erc-capab.el ends here
diff --git a/lisp/erc/erc-compat.el b/lisp/erc/erc-compat.el
index 9d652b26d05..60cbe992d19 100644
--- a/lisp/erc/erc-compat.el
+++ b/lisp/erc/erc-compat.el
@@ -1,6 +1,6 @@
 ;;; erc-compat.el --- ERC compatibility code for XEmacs
 
-;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki/ERC
diff --git a/lisp/erc/erc-dcc.el b/lisp/erc/erc-dcc.el
index eeb3e93801e..2c906af4516 100644
--- a/lisp/erc/erc-dcc.el
+++ b/lisp/erc/erc-dcc.el
@@ -1,6 +1,6 @@
 ;;; erc-dcc.el --- CTCP DCC module for ERC
 
-;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006
+;; Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Ben A. Mesander <ben@gnu.ai.mit.edu>
@@ -863,29 +863,29 @@ buffer, and sends back the replies after each block of data per the DCC
 protocol spec.  Well not really.  We write back a reply after each read,
 rather than every 1024 byte block, but nobody seems to care."
   (with-current-buffer (process-buffer proc)
-    (setq buffer-read-only nil) ;; FIXME
-    (goto-char (point-max))
-    (insert (string-make-unibyte str))
-
-    (setq erc-dcc-byte-count (+ (length str) erc-dcc-byte-count))
-    (erc-assert (= erc-dcc-byte-count (1- (point-max))))
-    (and erc-verbose-dcc
-         (erc-display-message
-          nil 'notice erc-server-process
-          'dcc-get-bytes-received
-          ?f (file-name-nondirectory buffer-file-name)
-          ?b (number-to-string erc-dcc-byte-count)))
-    (cond
-     ((and (> (plist-get erc-dcc-entry-data :size) 0)
-           (> erc-dcc-byte-count (plist-get erc-dcc-entry-data :size)))
-      (erc-display-message
-       nil '(error notice) 'active
-       'dcc-get-file-too-long
-       ?f (file-name-nondirectory buffer-file-name))
-      (delete-process proc))
-     (t
-      (process-send-string
-       proc (erc-pack-int erc-dcc-byte-count 4))))))
+    (let ((inhibit-read-only t))
+      (goto-char (point-max))
+      (insert (string-make-unibyte str))
+
+      (setq erc-dcc-byte-count (+ (length str) erc-dcc-byte-count))
+      (erc-assert (= erc-dcc-byte-count (1- (point-max))))
+      (and erc-verbose-dcc
+           (erc-display-message
+            nil 'notice erc-server-process
+            'dcc-get-bytes-received
+            ?f (file-name-nondirectory buffer-file-name)
+            ?b (number-to-string erc-dcc-byte-count)))
+      (cond
+       ((and (> (plist-get erc-dcc-entry-data :size) 0)
+             (> erc-dcc-byte-count (plist-get erc-dcc-entry-data :size)))
+        (erc-display-message
+         nil '(error notice) 'active
+         'dcc-get-file-too-long
+         ?f (file-name-nondirectory buffer-file-name))
+        (delete-process proc))
+       (t
+        (process-send-string
+         proc (erc-pack-int erc-dcc-byte-count 4)))))))
 
 
 (defun erc-dcc-get-sentinel (proc event)
diff --git a/lisp/erc/erc-ezbounce.el b/lisp/erc/erc-ezbounce.el
index ea5afcabcbe..f63682c51ff 100644
--- a/lisp/erc/erc-ezbounce.el
+++ b/lisp/erc/erc-ezbounce.el
@@ -1,6 +1,6 @@
 ;;; erc-ezbounce.el ---  Handle EZBounce bouncer commands
 
-;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-fill.el b/lisp/erc/erc-fill.el
index 9552ce8543d..26ca86f04c6 100644
--- a/lisp/erc/erc-fill.el
+++ b/lisp/erc/erc-fill.el
@@ -1,6 +1,6 @@
 ;;; erc-fill.el --- Filling IRC messages in various ways
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;;         Mario Lang <mlang@delysid.org>
diff --git a/lisp/erc/erc-goodies.el b/lisp/erc/erc-goodies.el
index f6d32ee7c06..933e6b34b52 100644
--- a/lisp/erc/erc-goodies.el
+++ b/lisp/erc/erc-goodies.el
@@ -1,6 +1,6 @@
 ;; erc-goodies.el --- Collection of ERC modules
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
diff --git a/lisp/erc/erc-hecomplete.el b/lisp/erc/erc-hecomplete.el
index 85a81569782..e6f91ce8998 100644
--- a/lisp/erc/erc-hecomplete.el
+++ b/lisp/erc/erc-hecomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-hecomplete.el --- Provides Nick name completion for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; URL: http://www.emacswiki.org/cgi-bin/wiki.pl?ErcCompletion
diff --git a/lisp/erc/erc-ibuffer.el b/lisp/erc/erc-ibuffer.el
index 24eb2f09ccb..5266d837d64 100644
--- a/lisp/erc/erc-ibuffer.el
+++ b/lisp/erc/erc-ibuffer.el
@@ -1,6 +1,6 @@
 ;;; erc-ibuffer.el --- ibuffer integration with ERC
 
-;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-identd.el b/lisp/erc/erc-identd.el
index f30c40d4792..c7f7c615e92 100644
--- a/lisp/erc/erc-identd.el
+++ b/lisp/erc/erc-identd.el
@@ -1,6 +1,6 @@
 ;;; erc-identd.el --- RFC1413 (identd authentication protocol) server
 
-;; Copyright (C) 2003, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: comm, processes
diff --git a/lisp/erc/erc-imenu.el b/lisp/erc/erc-imenu.el
index e897a9d8a0c..5e005181b7b 100644
--- a/lisp/erc/erc-imenu.el
+++ b/lisp/erc/erc-imenu.el
@@ -1,6 +1,6 @@
 ;;; erc-imenu.el -- Imenu support for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-join.el b/lisp/erc/erc-join.el
index 86b79c538f1..fb59cd905a6 100644
--- a/lisp/erc/erc-join.el
+++ b/lisp/erc/erc-join.el
@@ -1,6 +1,6 @@
 ;;; erc-join.el --- autojoin channels on connect and reconnects
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: irc
diff --git a/lisp/erc/erc-lang.el b/lisp/erc/erc-lang.el
index 04cfbe9e220..c4d103a0f4a 100644
--- a/lisp/erc/erc-lang.el
+++ b/lisp/erc/erc-lang.el
@@ -1,6 +1,6 @@
 ;;; erc-lang.el --- provide the LANG command to ERC
 
-;; Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Maintainer: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/erc/erc-log.el b/lisp/erc/erc-log.el
index bd4ed3387d5..22c9b3622d3 100644
--- a/lisp/erc/erc-log.el
+++ b/lisp/erc/erc-log.el
@@ -1,6 +1,6 @@
 ;;; erc-log.el --- Logging facilities for ERC.
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lawrence Mitchell <wence@gmx.li>
 ;; Keywords: IRC, chat, client, Internet, logging
diff --git a/lisp/erc/erc-match.el b/lisp/erc/erc-match.el
index b5dc913a8c4..50e4cfbc521 100644
--- a/lisp/erc/erc-match.el
+++ b/lisp/erc/erc-match.el
@@ -1,6 +1,6 @@
 ;;; erc-match.el --- Highlight messages matching certain regexps
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: comm, faces
diff --git a/lisp/erc/erc-menu.el b/lisp/erc/erc-menu.el
index a2dc7a1b2f2..a5826625bde 100644
--- a/lisp/erc/erc-menu.el
+++ b/lisp/erc/erc-menu.el
@@ -1,6 +1,6 @@
 ;; erc-menu.el -- Menu-bar definitions for ERC
 
-;; Copyright (C) 2001, 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, menu
@@ -28,7 +28,7 @@
 
 ;;; Code:
 
-;(require 'erc)
+(require 'erc)
 (require 'easymenu)
 
 (defvar erc-menu-definition
@@ -40,41 +40,43 @@
 	 (and erc-server-connected (fboundp 'erc-list-channels))]
 	["Join channel..." erc-join-channel erc-server-connected]
 	["Start a query..." erc-cmd-QUERY erc-server-connected]
-	"-"
-	["List users in channel" erc-channel-names erc-channel-users]
-	["List channel operators" erc-cmd-OPS erc-channel-users]
 	["Input action..." erc-input-action (erc-default-target)]
-	["Set topic..." erc-set-topic
-	 (and (and (erc-default-target) (not (erc-query-buffer-p)))
-	      (or (not (member "t" erc-channel-modes))
-		  (erc-channel-user-op-p (erc-current-nick))))]
-	(list "Channel modes"
-	      ["Change mode..." erc-insert-mode-command
-	       (erc-channel-user-op-p (erc-current-nick))]
-	      ["No external send" (erc-toggle-channel-mode "n")
-	       :active (erc-channel-user-op-p (erc-current-nick))
-	       :style toggle :selected (member "n" erc-channel-modes)]
-	      ["Topic set by channel operator" (erc-toggle-channel-mode "t")
-	       :style toggle :selected (member "t" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Invite only" (erc-toggle-channel-mode "i")
-	       :style toggle :selected (member "i" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Private" (erc-toggle-channel-mode "p")
-	       :style toggle :selected (member "p" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Secret" (erc-toggle-channel-mode "s")
-	       :style toggle :selected (member "s" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Moderated" (erc-toggle-channel-mode "m")
-	       :style toggle :selected (member "m" erc-channel-modes)
-	       :active (erc-channel-user-op-p (erc-current-nick))]
-	      ["Set a limit..." erc-set-channel-limit
-	       (erc-channel-user-op-p (erc-current-nick))]
-	      ["Set a key..." erc-set-channel-key
-	       (erc-channel-user-op-p (erc-current-nick))])
-	["Leave this channel..." erc-part-from-channel erc-channel-users]
 	"-"
+	(list
+	 "Current channel"
+	 ["List users in channel" erc-channel-names erc-channel-users]
+	 ["List channel operators" erc-cmd-OPS erc-channel-users]
+	 ["Set topic..." erc-set-topic
+	  (and (and (erc-default-target) (not (erc-query-buffer-p)))
+	       (or (not (member "t" erc-channel-modes))
+		   (erc-channel-user-op-p (erc-current-nick))))]
+	 (list "Channel modes"
+	       ["Change mode..." erc-insert-mode-command
+		(erc-channel-user-op-p (erc-current-nick))]
+	       ["No external send" (erc-toggle-channel-mode "n")
+		:active (erc-channel-user-op-p (erc-current-nick))
+		:style toggle :selected (member "n" erc-channel-modes)]
+	       ["Topic set by channel operator" (erc-toggle-channel-mode "t")
+		:style toggle :selected (member "t" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Invite only" (erc-toggle-channel-mode "i")
+		:style toggle :selected (member "i" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Private" (erc-toggle-channel-mode "p")
+		:style toggle :selected (member "p" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Secret" (erc-toggle-channel-mode "s")
+		:style toggle :selected (member "s" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Moderated" (erc-toggle-channel-mode "m")
+		:style toggle :selected (member "m" erc-channel-modes)
+		:active (erc-channel-user-op-p (erc-current-nick))]
+	       ["Set a limit..." erc-set-channel-limit
+		(erc-channel-user-op-p (erc-current-nick))]
+	       ["Set a key..." erc-set-channel-key
+		(erc-channel-user-op-p (erc-current-nick))])
+	 ["Leave this channel..." erc-part-from-channel erc-channel-users]
+	 "-")
 	(list "Pals, fools and other keywords"
 	      ["Add pal..." erc-add-pal]
 	      ["Delete pal..." erc-delete-pal]
@@ -98,16 +100,46 @@
 	["Show ERC version" erc-version t])
   "ERC menu definition.")
 
-;; `erc-mode-map' must be defined before doing this
-(eval-after-load "erc"
-  '(progn
-     (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition)
-     (easy-menu-add erc-menu erc-mode-map)
+(defvar erc-menu-defined nil
+  "Internal variable used to keep track of whether we've defined the
+ERC menu yet.")
 
-     ;; for some reason the menu isn't automatically added to the menu bar
-     (when (featurep 'xemacs)
-       (add-hook 'erc-mode-hook
-		 (lambda () (easy-menu-add erc-menu erc-mode-map))))))
+;;;###autoload (autoload 'erc-menu-mode "erc-menu" nil t)
+(define-erc-module menu nil
+  "Enable a menu in ERC buffers."
+  ((unless erc-menu-defined
+     ;; make sure the menu only gets defined once, since Emacs 22
+     ;; activates it immediately
+     (easy-menu-define erc-menu erc-mode-map "ERC menu" erc-menu-definition)
+     (setq erc-menu-defined t))
+   (if (featurep 'xemacs)
+       (progn
+	 ;; the menu isn't automatically added to the menu bar in
+	 ;; XEmacs
+	 (add-hook 'erc-mode-hook 'erc-menu-add)
+	 (dolist (buffer (erc-buffer-list))
+	   (with-current-buffer buffer (erc-menu-add))))
+     (erc-menu-add)))
+  ((if (featurep 'xemacs)
+       (progn
+	 (remove-hook 'erc-mode-hook 'erc-menu-add)
+	 (dolist (buffer (erc-buffer-list))
+	   (with-current-buffer buffer (erc-menu-remove))))
+     (erc-menu-remove)
+     ;; `easy-menu-remove' is a no-op in Emacs 22
+     (message "You might have to restart Emacs to remove the ERC menu"))))
+
+;; silence byte-compiler warning
+(eval-when-compile
+  (defvar erc-menu nil))
+
+(defun erc-menu-add ()
+  "Add the ERC menu to the current buffer."
+  (easy-menu-add erc-menu erc-mode-map))
+
+(defun erc-menu-remove ()
+  "Remove the ERC menu from the current buffer."
+  (easy-menu-remove erc-menu))
 
 (provide 'erc-menu)
 
diff --git a/lisp/erc/erc-netsplit.el b/lisp/erc/erc-netsplit.el
index 72e7b8bbd7f..567c91cc075 100644
--- a/lisp/erc/erc-netsplit.el
+++ b/lisp/erc/erc-netsplit.el
@@ -1,6 +1,6 @@
 ;;; erc-netsplit.el --- Reduce JOIN/QUIT messages on netsplits
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-networks.el b/lisp/erc/erc-networks.el
index 034950e665f..9f8c5528d04 100644
--- a/lisp/erc/erc-networks.el
+++ b/lisp/erc/erc-networks.el
@@ -1,6 +1,6 @@
 ;;; erc-networks.el --- IRC networks
 
-;; Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-nicklist.el b/lisp/erc/erc-nicklist.el
index 7a94d2be9cc..f37b8eab996 100644
--- a/lisp/erc/erc-nicklist.el
+++ b/lisp/erc/erc-nicklist.el
@@ -1,6 +1,6 @@
 ;;; erc-nicklist.el --- Display channel nicknames in a side buffer.
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Filename: erc-nicklist.el
 ;; Author: Lawrence Mitchell <wence@gmx.li>
diff --git a/lisp/erc/erc-notify.el b/lisp/erc/erc-notify.el
index bb1c9cdceb3..82784c624c0 100644
--- a/lisp/erc/erc-notify.el
+++ b/lisp/erc/erc-notify.el
@@ -1,6 +1,6 @@
 ;;; erc-notify.el --- Online status change notification
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@lexx.delysid.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-page.el b/lisp/erc/erc-page.el
index 4c6b86bd564..de13c6037a6 100644
--- a/lisp/erc/erc-page.el
+++ b/lisp/erc/erc-page.el
@@ -1,6 +1,6 @@
 ;; erc-page.el - CTCP PAGE support for ERC
 
-;; Copyright (C) 2002, 2004, 2006 Free Software Foundation
+;; Copyright (C) 2002, 2004, 2006, 2007 Free Software Foundation
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-pcomplete.el b/lisp/erc/erc-pcomplete.el
index 33231ee2590..951ba25898c 100644
--- a/lisp/erc/erc-pcomplete.el
+++ b/lisp/erc/erc-pcomplete.el
@@ -1,6 +1,6 @@
 ;;; erc-pcomplete.el --- Provides programmable completion for ERC
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sacha Chua <sacha@free.net.ph>
 ;; Keywords: comm, convenience
diff --git a/lisp/erc/erc-replace.el b/lisp/erc/erc-replace.el
index 7a22954f171..5e63f8d7d4f 100644
--- a/lisp/erc/erc-replace.el
+++ b/lisp/erc/erc-replace.el
@@ -1,6 +1,6 @@
 ;; erc-replace.el -- wash and massage messages inserted into the buffer
 
-;; Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Maintainer: Mario Lang (mlang@delysid.org)
diff --git a/lisp/erc/erc-ring.el b/lisp/erc/erc-ring.el
index 87707e65faa..911a154e915 100644
--- a/lisp/erc/erc-ring.el
+++ b/lisp/erc/erc-ring.el
@@ -1,6 +1,6 @@
 ;; erc-ring.el -- Command history handling for erc using ring.el
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: comm
diff --git a/lisp/erc/erc-services.el b/lisp/erc/erc-services.el
index b93317e6124..5d03a7b6365 100644
--- a/lisp/erc/erc-services.el
+++ b/lisp/erc/erc-services.el
@@ -1,6 +1,6 @@
 ;;; erc-services.el --- Identify to NickServ
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -77,6 +77,29 @@ This group allows you to set variables to somewhat automate
 communication with those Services."
   :group 'erc)
 
+(defcustom erc-nickserv-identify-mode 'both
+  "The mode which is used when identifying to Nickserv.
+
+Possible settings are:.
+
+'autodetect  - Identify when the real Nickserv sends an identify request.
+'nick-change - Identify when you log in or change your nickname.
+'both        - Do the former if the network supports it, otherwise do the
+               latter.
+nil          - Disables automatic Nickserv identification.
+
+You can also use M-x erc-nickserv-identify-mode to change modes."
+  :group 'erc-services
+  :type '(choice (const autodetect)
+		 (const nick-change)
+		 (const both)
+		 (const nil))
+  :set (lambda (sym val)
+	 (set sym val)
+	 ;; avoid recursive load at startup
+	 (when (featurep 'erc-services)
+	   (erc-nickserv-identify-mode val))))
+
 ;;;###autoload (autoload 'erc-services-mode "erc-services" nil t)
 (define-erc-module services nickserv
   "This mode automates communication with services."
@@ -128,27 +151,6 @@ communication with those Services."
 	 (remove-hook 'erc-nick-changed-functions
 		      'erc-nickserv-identify-on-nick-change))))
 
-(defcustom erc-nickserv-identify-mode 'both
-  "The mode which is used when identifying to Nickserv.
-
-Possible settings are:.
-
-'autodetect  - Identify when the real Nickserv sends an identify request.
-'nick-change - Identify when you change your nickname.
-'both        - Do the former if the network supports it, otherwise do the
-               latter.
-nil          - Disables automatic Nickserv identification.
-
-You can also use M-x erc-nickserv-identify-mode to change modes."
-  :group 'erc-services
-  :type '(choice (const autodetect)
-		 (const nick-change)
-		 (const both)
-		 (const nil))
-  :set (lambda (sym val)
-	 (set sym val)
-	 (erc-nickserv-identify-mode val)))
-
 (defcustom erc-prompt-for-nickserv-password t
   "Ask for the password when identifying to NickServ."
   :group 'erc-services
@@ -184,7 +186,13 @@ Example of use:
 ;; Variables:
 
 (defcustom erc-nickserv-alist
-  '((DALnet
+  '((BitlBee
+     nil
+     nil
+     "&bitlbee"
+     "identify"
+     nil)
+    (DALnet
      "NickServ!service@dal.net"
      "/msg\\s-NickServ@services.dal.net\\s-IDENTIFY\\s-<password>"
      "NickServ@services.dal.net"
@@ -266,6 +274,24 @@ ANSWER is the command to use for the answer.  The default is 'privmsg.
 		  (string :tag "Command")
 		  (const :tag "No special command necessary" nil)))))
 
+(defsubst erc-nickserv-alist-sender (network &optional entry)
+  (nth 1 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-regexp (network &optional entry)
+  (nth 2 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-nickserv (network &optional entry)
+  (nth 3 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-ident-keyword (network &optional entry)
+  (nth 4 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-use-nick-p (network &optional entry)
+  (nth 5 (or entry (assoc network erc-nickserv-alist))))
+
+(defsubst erc-nickserv-alist-ident-command (network &optional entry)
+  (nth 6 (or entry (assoc network erc-nickserv-alist))))
+
 ;; Functions:
 
 (defun erc-nickserv-identify-autodetect (proc parsed)
@@ -277,14 +303,14 @@ password for this nickname, otherwise try to send it automatically."
   (unless (and (null erc-nickserv-passwords)
 	       (null erc-prompt-for-nickserv-password))
     (let* ((network (erc-network))
-	   (nickserv (nth 1 (assoc network erc-nickserv-alist)))
-	   (identify-regex (nth 2 (assoc network erc-nickserv-alist)))
+	   (sender (erc-nickserv-alist-sender network))
+	   (identify-regex (erc-nickserv-alist-regexp network))
 	   (sspec (erc-response.sender parsed))
 	   (nick (car (erc-response.command-args parsed)))
 	   (msg (erc-response.contents parsed)))
       ;; continue only if we're sure it's the real nickserv for this network
       ;; and it's asked us to identify
-      (when (and nickserv (equal sspec nickserv)
+      (when (and sender (equal sspec sender)
 		 (string-match identify-regex msg))
 	(erc-log "NickServ IDENTIFY request detected")
 	(erc-nickserv-call-identify-function nick)
@@ -295,7 +321,7 @@ password for this nickname, otherwise try to send it automatically."
   (unless (or (and (null erc-nickserv-passwords)
 		   (null erc-prompt-for-nickserv-password))
 	      (and (eq erc-nickserv-identify-mode 'both)
-		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
+		   (erc-nickserv-alist-regexp (erc-network))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-identify-on-nick-change (nick old-nick)
@@ -303,7 +329,7 @@ password for this nickname, otherwise try to send it automatically."
   (unless (or (and (null erc-nickserv-passwords)
 		   (null erc-prompt-for-nickserv-password))
 	      (and (eq erc-nickserv-identify-mode 'both)
-		   (nth 2 (assoc (erc-network) erc-nickserv-alist))))
+		   (erc-nickserv-alist-regexp (erc-network))))
     (erc-nickserv-call-identify-function nick)))
 
 (defun erc-nickserv-call-identify-function (nickname)
@@ -333,12 +359,16 @@ When called interactively, read the password using `read-passwd'."
     (let* ((erc-auto-discard-away nil)
 	   (network (erc-network))
 	   (nickserv-info (assoc network erc-nickserv-alist))
-	   (nickserv (or (nth 3 nickserv-info) "NickServ"))
-	   (identify-word (or (nth 4 nickserv-info) "IDENTIFY"))
-	   (nick (if (nth 5 nickserv-info)
+	   (nickserv (or (erc-nickserv-alist-nickserv nil nickserv-info)
+			 "NickServ"))
+	   (identify-word (or (erc-nickserv-alist-ident-keyword
+			       nil nickserv-info)
+			      "IDENTIFY"))
+	   (nick (if (erc-nickserv-alist-use-nick-p nil nickserv-info)
 		     (concat (erc-current-nick) " ")
 		   ""))
-	   (msgtype (or (nth 6 nickserv-info) "PRIVMSG")))
+	   (msgtype (or (erc-nickserv-alist-ident-command nil nickserv-info)
+			"PRIVMSG")))
       (erc-message msgtype
 		   (concat nickserv " " identify-word " " nick password)))))
 
diff --git a/lisp/erc/erc-sound.el b/lisp/erc/erc-sound.el
index e152d8ed0df..fdac1cc3be0 100644
--- a/lisp/erc/erc-sound.el
+++ b/lisp/erc/erc-sound.el
@@ -1,6 +1,6 @@
 ;;; erc-sound.el --- CTCP SOUND support for ERC
 
-;; Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/erc/erc-speedbar.el b/lisp/erc/erc-speedbar.el
index 55e24782f77..551b83fb5ac 100644
--- a/lisp/erc/erc-speedbar.el
+++ b/lisp/erc/erc-speedbar.el
@@ -1,6 +1,6 @@
 ;;; erc-speedbar.el --- Speedbar support for ERC
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Contributor: Eric M. Ludlam <eric@siege-engine.com>
diff --git a/lisp/erc/erc-spelling.el b/lisp/erc/erc-spelling.el
index 7ed0f510539..484ddb36d52 100644
--- a/lisp/erc/erc-spelling.el
+++ b/lisp/erc/erc-spelling.el
@@ -1,6 +1,6 @@
 ;;; erc-spelling.el --- use flyspell in ERC
 
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jorgen Schaefer <forcer@forcix.cx>
 ;; Keywords: irc
diff --git a/lisp/erc/erc-stamp.el b/lisp/erc/erc-stamp.el
index b0622b99443..5a9977aaead 100644
--- a/lisp/erc/erc-stamp.el
+++ b/lisp/erc/erc-stamp.el
@@ -1,6 +1,6 @@
 ;;; erc-stamp.el --- Timestamping for ERC messages
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes, timestamp
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index 3c8f93acfc2..0fa550a5838 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -1,6 +1,6 @@
 ;;; erc-track.el --- Track modified channel buffers
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, faces
@@ -773,10 +773,6 @@ is in `erc-mode'."
 		      str)
    (erc-faces-in str)))
 
-(defun erc-find-parsed-property ()
-  "Find the next occurrence of the `erc-parsed' text property."
-  (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
-
 ;;; Buffer switching
 
 (defvar erc-track-last-non-erc-buffer nil
diff --git a/lisp/erc/erc-truncate.el b/lisp/erc/erc-truncate.el
index 76475ab8ee5..440dc870e2c 100644
--- a/lisp/erc/erc-truncate.el
+++ b/lisp/erc/erc-truncate.el
@@ -1,6 +1,6 @@
 ;;; erc-truncate.el --- Functions for truncating ERC buffers
 
-;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andreas Fuchs <asf@void.at>
 ;; Keywords: IRC, chat, client, Internet, logging
diff --git a/lisp/erc/erc-xdcc.el b/lisp/erc/erc-xdcc.el
index d00dfc5e1a0..ea1fa27bf4b 100644
--- a/lisp/erc/erc-xdcc.el
+++ b/lisp/erc/erc-xdcc.el
@@ -1,6 +1,6 @@
 ;;; erc-xdcc.el --- XDCC file-server support for ERC
 
-;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mario Lang <mlang@delysid.org>
 ;; Keywords: comm, processes
diff --git a/lisp/erc/erc.el b/lisp/erc/erc.el
index 427dd178383..927dce02d64 100644
--- a/lisp/erc/erc.el
+++ b/lisp/erc/erc.el
@@ -1,7 +1,7 @@
 ;; erc.el --- An Emacs Internet Relay Chat client
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alexander L. Belikoff (alexander@belikoff.net)
 ;; Contributors: Sergey Berezin (sergey.berezin@cs.cmu.edu),
@@ -74,7 +74,6 @@
 (require 'pp)
 (require 'thingatpt)
 (require 'erc-compat)
-(require 'erc-menu)
 
 (defvar erc-official-location
   "http://emacswiki.org/cgi-bin/wiki/ERC (mailing list: erc-discuss@gnu.org)"
@@ -356,6 +355,17 @@ nicknames with erc-server-user struct instances.")
 	      (cdr (assq (aref s (match-beginning 0)) c)))))
     s))
 
+(defmacro erc-with-server-buffer (&rest body)
+  "Execute BODY in the current ERC server buffer.
+If no server buffer exists, return nil."
+  (let ((buffer (make-symbol "buffer")))
+    `(let ((,buffer (erc-server-buffer)))
+       (when (buffer-live-p ,buffer)
+	 (with-current-buffer ,buffer
+	   ,@body)))))
+(put 'erc-with-server-buffer 'lisp-indent-function 0)
+(put 'erc-with-server-buffer 'edebug-form-spec '(body))
+
 (defstruct (erc-server-user (:type vector) :named)
   ;; User data
   nickname host login full-name info
@@ -782,6 +792,13 @@ set if some hacker is trying to flood you away."
   :group 'erc
   :type 'string)
 
+(defcustom erc-system-name nil
+  "Use this as the name of your system.
+If nil, ERC will call `system-name' to get this information."
+  :group 'erc
+  :type '(choice (const :tag "Default system name" nil)
+		 string))
+
 (defcustom erc-ignore-list nil
   "*List of regexps matching user identifiers to ignore.
 
@@ -1333,6 +1350,14 @@ If BUFFER is nil, the current buffer is used."
     (and (eq major-mode 'erc-mode)
 	 (null (erc-default-target)))))
 
+(defun erc-open-server-buffer-p (&optional buffer)
+  "Return non-nil if argument BUFFER is an ERC server buffer that
+has an open IRC process.
+
+If BUFFER is nil, the current buffer is used."
+  (and (erc-server-buffer-p)
+       (erc-server-process-alive)))
+
 (defun erc-query-buffer-p (&optional buffer)
   "Return non-nil if BUFFER is an ERC query buffer.
 If BUFFER is nil, the current buffer is used."
@@ -1764,7 +1789,7 @@ all channel buffers on all servers."
 
 (defcustom erc-modules '(netsplit fill button match track completion readonly
 				  ring autojoin noncommands irccontrols
-				  stamp)
+				  stamp menu)
   "A list of modules which ERC should enable.
 If you set the value of this without using `customize' remember to call
 \(erc-update-modules) after you change it.  When using `customize', modules
@@ -1791,17 +1816,21 @@ removed from the list will be disabled."
     (const :tag "Set away status automatically" autoaway)
     (const :tag "Join channels automatically" autojoin)
     (const :tag "Buttonize URLs, nicknames, and other text" button)
+    (const
+     :tag
+     "Mark unidentified users on freenode and other servers supporting CAPAB"
+     capab-identify)
     (const :tag "Wrap long lines" fill)
     (const :tag "Launch an identd server on port 8113" identd)
     (const :tag "Highlight or remove IRC control characters"
 	   irccontrols)
     (const :tag "Save buffers in logs" log)
     (const :tag "Highlight pals, fools, and other keywords" match)
+    (const :tag "Display a menu in ERC buffers" menu)
     (const :tag "Detect netsplits" netsplit)
     (const :tag "Don't display non-IRC commands after evaluation"
 	   noncommands)
-    (const :tag
-	   "Notify when the online status of certain users changes"
+    (const :tag "Notify when the online status of certain users changes"
 	   notify)
     (const :tag "Complete nicknames and commands (programmable)"
 	   completion)
@@ -1831,6 +1860,8 @@ removed from the list will be disabled."
       (setq req (concat "erc-" (symbol-name mod)))
       (cond
        ;; yuck. perhaps we should bring the filenames into sync?
+       ((string= req "erc-capab-identify")
+	(setq req "erc-capab"))
        ((string= req "erc-completion")
 	(setq req "erc-pcomplete"))
        ((string= req "erc-pcomplete")
@@ -1891,6 +1922,7 @@ Returns the buffer for the given server or channel."
 	(old-buffer (current-buffer))
 	old-point
 	continued-session)
+    (when connect (run-hook-with-args 'erc-before-connect server port nick))
     (erc-update-modules)
     (set-buffer buffer)
     (setq old-point (point))
@@ -2104,8 +2136,6 @@ server and full-name will be set to those values, whereas
 `erc-compute-port', `erc-compute-nick' and `erc-compute-full-name' will
 be invoked for the values of the other parameters."
   (interactive (erc-select-read-args))
-
-  (run-hook-with-args 'erc-before-connect server port nick)
   (erc-open server port nick full-name t password))
 
 (defalias 'erc-select 'erc)
@@ -4300,8 +4330,10 @@ See also `erc-display-message'."
   nil)
 
 (defun erc-process-away (proc away-p)
-  ;; FIXME: This docstring is AWFUL -- Lawrence 2004-01-08
-  "Process the user being away, or returning from an away break."
+  "Toggle the away status of the user depending on the value of AWAY-P.
+
+If nil, set the user as away.
+If non-nil, return from being away."
   (let ((sessionbuf (process-buffer proc)))
     (when sessionbuf
       (with-current-buffer sessionbuf
@@ -4881,6 +4913,9 @@ Specifically, return the position of `erc-insert-marker'."
    erc-input-marker
    (erc-end-of-input-line)))
 
+(defvar erc-command-regexp "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$"
+  "Regular expression used for matching commands in ERC.")
+
 (defun erc-send-input (input)
   "Treat INPUT as typed in by the user. It is assumed that the input
 and the prompt is already deleted.
@@ -4902,7 +4937,7 @@ This returns non-nil only iff we actually send anything."
       (run-hook-with-args 'erc-send-pre-hook input)
       (when erc-send-this
 	(if (or (string-match "\n" str)
-		(not (char-equal (aref str 0) ?/)))
+		(not (string-match erc-command-regexp str)))
 	    (mapc
 	     (lambda (line)
 	       (mapc
@@ -4967,7 +5002,7 @@ current position."
   "Extract command and args from the input LINE.
 If no command was given, return nil.  If command matches, return a
 list of the form: (command args) where both elements are strings."
-  (when (string-match "^/\\([A-Za-z]+\\)\\(\\s-+.*\\|\\s-*\\)$" line)
+  (when (string-match erc-command-regexp line)
     (let* ((cmd (erc-command-symbol (match-string 1 line)))
 	   ;; note: return is nil, we apply this simply for side effects
 	   (canon-defun (while (and cmd (symbolp (symbol-function cmd)))
@@ -5406,7 +5441,7 @@ user input."
   (erc-log (format "login: nick: %s, user: %s %s %s :%s"
 		   (erc-current-nick)
 		   (user-login-name)
-		   (system-name)
+		   (or erc-system-name (system-name))
 		   erc-session-server
 		   erc-session-user-full-name))
   (if erc-session-password
@@ -5655,6 +5690,7 @@ of `mode-line-buffer-identification'.
 
 The following characters are replaced:
 %a: String indicating away status or \"\" if you are not away
+%l: The estimated lag time to the server
 %m: The modes of the channel
 %n: The current nick name
 %o: The topic of the channel
@@ -5666,9 +5702,9 @@ The following characters are replaced:
   :group 'erc-mode-line-and-header
   :type 'string)
 
-(defcustom erc-header-line-format "[IRC] %n on %t %m %o"
+(defcustom erc-header-line-format "%n on %t (%m,%l) %o"
   "A string to be formatted and shown in the header-line in `erc-mode'.
-Only used in Emacs 21.
+Only used starting in Emacs 21.
 
 See `erc-mode-line-format' for which characters are can be used."
   :group 'erc-mode-line-and-header
@@ -5758,33 +5794,37 @@ if `erc-away' is non-nil."
       "")))
 
 (defun erc-format-channel-modes ()
-  "Return the current channel's modes and the estimated lag."
+  "Return the current channel's modes."
+  (concat (apply 'concat
+		 "+" erc-channel-modes)
+	  (cond ((and erc-channel-user-limit erc-channel-key)
+		 (if erc-show-channel-key-p
+		     (format "lk %.0f %s" erc-channel-user-limit
+			     erc-channel-key)
+		   (format "kl %.0f" erc-channel-user-limit)))
+		(erc-channel-user-limit
+		 ;; Emacs has no bignums
+		 (format "l %.0f" erc-channel-user-limit))
+		(erc-channel-key
+		 (if erc-show-channel-key-p
+		     (format "k %s" erc-channel-key)
+		   "k"))
+		(t nil))))
+
+(defun erc-format-lag-time ()
+  "Return the estimated lag time to server, `erc-server-lag'."
   (let ((lag (when (erc-server-buffer-live-p)
 	       (with-current-buffer (process-buffer erc-server-process)
 		 erc-server-lag))))
-    (concat (apply 'concat
-		   "(+" erc-channel-modes)
-	    (cond ((and erc-channel-user-limit erc-channel-key)
-		   (if erc-show-channel-key-p
-		       (format "lk %.0f %s" erc-channel-user-limit
-			       erc-channel-key)
-		     (format "kl %.0f" erc-channel-user-limit)))
-		  (erc-channel-user-limit
-		   ;; Emacs has no bignums
-		   (format "l %.0f" erc-channel-user-limit))
-		  (erc-channel-key
-		   (if erc-show-channel-key-p
-		       (format "k %s" erc-channel-key)
-		     "k"))
-		  (t ""))
-	    (if lag (format ",lag:%.0f" lag) "")
-	    ")")))
+    (cond (lag (format "lag:%.0f" lag))
+	  (t ""))))
 
 (defun erc-update-mode-line-buffer (buffer)
   "Update the mode line in a single ERC buffer BUFFER."
   (with-current-buffer buffer
     (let ((spec (format-spec-make
 		 ?a (erc-format-away-status)
+		 ?l (erc-format-lag-time)
 		 ?m (erc-format-channel-modes)
 		 ?n (or (erc-current-nick) "")
 		 ?o (erc-controls-strip erc-channel-topic)
@@ -5831,7 +5871,10 @@ if `erc-away' is non-nil."
 			      (erc-propertize header 'help-echo help-echo
 					      'face face)
 			    (erc-propertize header 'help-echo help-echo))))))
-		(t (setq header-line-format header))))))
+		(t (setq header-line-format
+			 (if face
+			     (erc-propertize header 'face face)
+			   header)))))))
     (if (featurep 'xemacs)
 	(redraw-modeline)
       (force-mode-line-update))))
@@ -6185,6 +6228,10 @@ This function should be on `erc-kill-channel-hook'."
 
 ;;; Dealing with `erc-parsed'
 
+(defun erc-find-parsed-property ()
+  "Find the next occurrence of the `erc-parsed' text property."
+  (text-property-not-all (point-min) (point-max) 'erc-parsed nil))
+
 (defun erc-get-parsed-vector (point)
   "Return the whole parsed vector on POINT."
   (get-text-property point 'erc-parsed))
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index 96ec9d5e025..d2d5deae2f7 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -1,7 +1,7 @@
 ;;; em-alias.el --- creation and management of command aliases
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index 382964f304d..51d547a71c4 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -1,7 +1,7 @@
 ;;; em-banner.el --- sample module that displays a login banner
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-basic.el b/lisp/eshell/em-basic.el
index bcc1ef80f91..b727bb05932 100644
--- a/lisp/eshell/em-basic.el
+++ b/lisp/eshell/em-basic.el
@@ -1,7 +1,7 @@
 ;;; em-basic.el --- basic shell builtin commands
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index 50767a4a482..e0f39eea262 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -1,7 +1,7 @@
 ;;; em-cmpl.el --- completion using the TAB key
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index dfcf9836061..2b308d5c6a1 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -1,7 +1,7 @@
 ;;; em-dirs.el --- directory navigation commands
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index bb9abc8aaa8..859a8a07c38 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -1,7 +1,7 @@
 ;;; em-glob.el --- extended file name globbing
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 24730f889f1..2fd0c485562 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -1,7 +1,7 @@
 ;;; em-hist.el --- history list management
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 68e7caec0b0..0473ef22973 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -1,7 +1,7 @@
 ;;; em-ls.el --- implementation of ls in Lisp
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 6a03a689a9f..71e34346d77 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -1,7 +1,7 @@
 ;;; em-pred.el --- argument predicates and modifiers (ala zsh)
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 8476e64fc7a..03c60988e58 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -1,7 +1,7 @@
 ;;; em-prompt.el --- command prompts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 65ca9676d55..c1488f47234 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -1,7 +1,7 @@
 ;;; em-rebind.el --- rebind keys when point is at current input
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index 356fe76961e..92f077cd597 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -1,7 +1,7 @@
 ;;; em-script.el --- Eshell script files
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 5537d1c72f1..f9aed42e3ce 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -1,7 +1,7 @@
 ;;; em-smart.el --- smart display of output
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index af6aa66c328..bb405473239 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -1,7 +1,7 @@
 ;;; em-term.el --- running visual commands
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index ead8e6e48a6..9c55fe16b6d 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -1,7 +1,7 @@
 ;;; em-unix.el --- UNIX command aliases
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/em-xtra.el b/lisp/eshell/em-xtra.el
index 8b77186f46a..347ab69ff17 100644
--- a/lisp/eshell/em-xtra.el
+++ b/lisp/eshell/em-xtra.el
@@ -1,7 +1,7 @@
 ;;; em-xtra.el --- extra alias functions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index 1b01501fb61..9a5ead5ddff 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -1,7 +1,7 @@
 ;;; esh-arg.el --- argument processing
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 6c698c79393..cc818650579 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -1,7 +1,7 @@
 ;;; esh-cmd.el --- command invocation
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index f0aa026d8e4..6951d580fdc 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -1,7 +1,7 @@
 ;;; esh-ext.el --- commands external to Eshell
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index 18dcb87b9ee..f9684601fc4 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -1,7 +1,7 @@
 ;;; esh-io.el --- I/O management
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-maint.el b/lisp/eshell/esh-maint.el
index 44c8935af28..a0219beca63 100644
--- a/lisp/eshell/esh-maint.el
+++ b/lisp/eshell/esh-maint.el
@@ -1,7 +1,7 @@
 ;;; esh-maint.el --- init code for building eshell -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 2da540a0abd..c185e88d8a8 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -1,7 +1,7 @@
 ;;; esh-mode.el --- user interface
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 412ee68d4a2..822caf54933 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -1,7 +1,7 @@
 ;;; esh-module.el --- Eshell modules
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes
diff --git a/lisp/eshell/esh-opt.el b/lisp/eshell/esh-opt.el
index dc9f125aa65..8e7b44174ce 100644
--- a/lisp/eshell/esh-opt.el
+++ b/lisp/eshell/esh-opt.el
@@ -1,7 +1,7 @@
 ;;; esh-opt.el --- command options processing
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index 7d8c66c1c53..d3dabbf04b5 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -1,7 +1,7 @@
 ;;; esh-proc.el --- process management
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-test.el b/lisp/eshell/esh-test.el
index d3f20c32274..ed1e75eb4df 100644
--- a/lisp/eshell/esh-test.el
+++ b/lisp/eshell/esh-test.el
@@ -1,7 +1,7 @@
 ;;; esh-test.el --- Eshell test suite
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 50ff77c7725..ce309aaaf9e 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -1,7 +1,7 @@
 ;;; esh-util.el --- general utilities
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 5f21eb13fdf..b116df456bf 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -1,7 +1,7 @@
 ;;; esh-var.el --- handling of variables
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 2a254e045ba..d7910dc252d 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -1,7 +1,7 @@
 ;;; eshell.el --- the Emacs command shell
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Version: 2.4.2
diff --git a/lisp/expand.el b/lisp/expand.el
index 12e0433b358..ebcf90ccfc2 100644
--- a/lisp/expand.el
+++ b/lisp/expand.el
@@ -1,7 +1,7 @@
 ;;; expand.el --- make abbreviations more usable
 
 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
 ;; Maintainer: Frederic Lepied <Frederic.Lepied@sugix.frmug.org>
diff --git a/lisp/ezimage.el b/lisp/ezimage.el
index ed8fb497aff..aaf9cabb480 100644
--- a/lisp/ezimage.el
+++ b/lisp/ezimage.el
@@ -1,7 +1,7 @@
 ;;; ezimage --- Generalized Image management
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index f767c8d4e26..44f184b12ee 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -1,7 +1,7 @@
 ;;; facemenu.el --- create a face menu for interactively adding fonts to text
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: faces
diff --git a/lisp/faces.el b/lisp/faces.el
index 0736cda2993..29f2729094f 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1,7 +1,7 @@
 ;;; faces.el --- Lisp faces
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/ffap.el b/lisp/ffap.el
index a36ba58e577..e49c77f4d47 100644
--- a/lisp/ffap.el
+++ b/lisp/ffap.el
@@ -1,7 +1,7 @@
 ;;; ffap.el --- find file (or url) at point
 
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michelangelo Grigni <mic@mathcs.emory.edu>
 ;; Maintainer: FSF
@@ -310,7 +310,7 @@ For a fancy alternative, get `ffap-url.el'."
   ;;
   ;; It pays to put a big fancy regexp here, since ffap-guesser is
   ;; much more time-consuming than regexp searching:
-  "[/:.~a-zA-Z]/\\|@[a-zA-Z][-a-zA-Z0-9]*\\."
+  "[/:.~[:alpha:]]/\\|@[[:alpha:]][-[:alnum:]]*\\."
   "*Regular expression governing movements of `ffap-next'."
   :type 'regexp
   :group 'ffap)
@@ -426,7 +426,7 @@ Returned values:
   ;; (ffap-machine-p "mathcs" 5678 nil 'ping)
   ;; (ffap-machine-p "foo.bonk" nil nil 'ping)
   ;; (ffap-machine-p "foo.bonk.com" nil nil 'ping)
-  (if (or (string-match "[^-a-zA-Z0-9.]" host) ; Illegal chars (?)
+  (if (or (string-match "[^-[:alnum:].]" host) ; Illegal chars (?)
 	  (not (string-match "[^0-9]" host))) ; 1: a number? 2: quick reject
       nil
     (let* ((domain
@@ -575,7 +575,7 @@ Looks at `ffap-ftp-default-user', returns \"\" for \"localhost\"."
    (ffap-ftp-regexp (ffap-host-to-filename mach))
    ))
 
-(defvar ffap-newsgroup-regexp "^[a-z]+\\.[-+a-z_0-9.]+$"
+(defvar ffap-newsgroup-regexp "^[[:lower:]]+\\.[-+[:lower:]_0-9.]+$"
   "Strings not matching this fail `ffap-newsgroup-p'.")
 (defvar ffap-newsgroup-heads		; entirely inadequate
   '("alt" "comp" "gnu" "misc" "news" "sci" "soc" "talk")
@@ -601,7 +601,7 @@ Looks at `ffap-ftp-default-user', returns \"\" for \"localhost\"."
 	     (setq heads nil))
 	 (error nil)))
      (or ret (not heads)
-	 (let ((head (string-match "\\`\\([a-z]+\\)\\." string)))
+	 (let ((head (string-match "\\`\\([[:lower:]]+\\)\\." string)))
 	   (and head (setq head (substring string 0 (match-end 1)))
 		(member head heads)
 		(setq ret string))))
@@ -780,7 +780,7 @@ This uses ffap-file-exists-string, which may try adding suffixes from
     ("" . ffap-completable)		; completion, slow on some systems
     ("\\.info\\'" . ffap-info)		; gzip.info
     ("\\`info/" . ffap-info-2)		; info/emacs
-    ("\\`[-a-z]+\\'" . ffap-info-3)	; (emacs)Top [only in the parentheses]
+    ("\\`[-[:lower:]]+\\'" . ffap-info-3) ; (emacs)Top [only in the parentheses]
     ("\\.elc?\\'" . ffap-el)		; simple.el, simple.elc
     (emacs-lisp-mode . ffap-el-mode)	; rmail, gnus, simple, custom
     ;; (lisp-interaction-mode . ffap-el-mode) ; maybe
@@ -969,15 +969,15 @@ If t, `ffap-tex-init' will initialize this when needed.")
     ;; Slightly controversial decisions:
     ;; * strip trailing "@" and ":"
     ;; * no commas (good for latex)
-    (file "--:$+<>@-Z_a-z~*?" "<@" "@>;.,!:")
+    (file "--:$+<>@-Z_[:lower:]~*?" "<@" "@>;.,!:")
     ;; An url, or maybe a email/news message-id:
-    (url "--:=&?$+@-Z_a-z~#,%;*" "^A-Za-z0-9" ":;.,!?")
+    (url "--:=&?$+@-Z_[:lower:]~#,%;*" "^[:alnum:]" ":;.,!?")
     ;; Find a string that does *not* contain a colon:
-    (nocolon "--9$+<>@-Z_a-z~" "<@" "@>;.,!?")
+    (nocolon "--9$+<>@-Z_[:lower:]~" "<@" "@>;.,!?")
     ;; A machine:
-    (machine "-a-zA-Z0-9." "" ".")
+    (machine "-[:alnum:]." "" ".")
     ;; Mathematica paths: allow backquotes
-    (math-mode ",-:$+<>@-Z_a-z~`" "<" "@>;.,!?`:")
+    (math-mode ",-:$+<>@-Z_[:lower:]~`" "<" "@>;.,!?`:")
     )
   "Alist of \(MODE CHARS BEG END\), where MODE is a symbol,
 possibly a major-mode name, or one of the symbol
@@ -1062,7 +1062,7 @@ Assumes the buffer has not changed."
     (let ((name (ffap-string-at-point 'url)))
       (cond
        ((string-match "^url:" name) (setq name (substring name 4)))
-       ((and (string-match "\\`[^:</>@]+@[^:</>@]+[a-zA-Z0-9]\\'" name)
+       ((and (string-match "\\`[^:</>@]+@[^:</>@]+[[:alnum:]]\\'" name)
 	     ;; "foo@bar": could be "mailto" or "news" (a Message-ID).
 	     ;; Without "<>" it must be "mailto".  Otherwise could be
 	     ;; either, so consult `ffap-foo-at-bar-prefix'.
@@ -1074,7 +1074,7 @@ Assumes the buffer has not changed."
 			     "mailto")))
 	       (and prefix (setq name (concat prefix ":" name))))))
        ((ffap-newsgroup-p name) (setq name (concat "news:" name)))
-       ((and (string-match "\\`[a-z0-9]+\\'" name) ; <mic> <root> <nobody>
+       ((and (string-match "\\`[[:alnum:]]+\\'" name) ; <mic> <root> <nobody>
 	     (equal (ffap-string-around) "<>")
 	     ;;	(ffap-user-p name):
 	     (not (string-match "~" (expand-file-name (concat "~" name))))
diff --git a/lisp/filecache.el b/lisp/filecache.el
index 27ecd1c14cd..10942c77f5e 100644
--- a/lisp/filecache.el
+++ b/lisp/filecache.el
@@ -5,7 +5,7 @@
 ;; Keywords: convenience
 ;;
 ;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/files.el b/lisp/files.el
index 3b28f28b59b..e32fa42795e 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1994, 1995, 1996,
 ;;   1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -1223,11 +1223,11 @@ killed."
   (unless (run-hook-with-args-until-failure 'kill-buffer-query-functions)
     (error "Aborted"))
   (when (and (buffer-modified-p) (buffer-file-name))
-    (if (yes-or-no-p (format "Buffer %s is modified; save it first? "
+    (if (yes-or-no-p (format "Buffer %s is modified; kill anyway? "
 			     (buffer-name)))
-	(save-buffer)
-      (unless (yes-or-no-p "Kill and replace the buffer without saving it? ")
-	(error "Aborted"))))
+	(unless (yes-or-no-p "Kill and replace the buffer without saving it? ")
+	  (error "Aborted"))
+      (save-buffer)))
   (let ((obuf (current-buffer))
 	(ofile buffer-file-name)
 	(onum buffer-file-number)
@@ -2506,6 +2506,7 @@ n  -- to ignore the local variables list.")
 			  ", or C-v to scroll")))
 	  (goto-char (point-min))
 	  (let ((cursor-in-echo-area t)
+		(executing-kbd-macro executing-kbd-macro)
 		(exit-chars
 		 (if offer-save '(?! ?y ?n ?\s ?\C-g) '(?y ?n ?\s ?\C-g)))
 		done)
@@ -2513,11 +2514,17 @@ n  -- to ignore the local variables list.")
 	      (message prompt)
 	      (setq char (read-event))
 	      (if (numberp char)
-		  (if (eq char ?\C-v)
-		      (condition-case nil
-			  (scroll-up)
-			(error (goto-char (point-min))))
-		    (setq done (memq (downcase char) exit-chars))))))
+		  (cond ((eq char ?\C-v)
+			 (condition-case nil
+			     (scroll-up)
+			   (error (goto-char (point-min)))))
+			;; read-event returns -1 if we are in a kbd
+			;; macro and there are no more events in the
+			;; macro.  In that case, attempt to get an
+			;; event interactively.
+			((and executing-kbd-macro (= char -1))
+			 (setq executing-kbd-macro nil))
+			(t (setq done (memq (downcase char) exit-chars)))))))
 	  (setq char (downcase char))
 	  (when (and offer-save (= char ?!) unsafe-vars)
 	    (dolist (elt unsafe-vars)
diff --git a/lisp/filesets.el b/lisp/filesets.el
index 355c39f8ed7..e13c4a321dd 100644
--- a/lisp/filesets.el
+++ b/lisp/filesets.el
@@ -1,6 +1,6 @@
 ;;; filesets.el --- handle group of files
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Thomas Link <t.link@gmx.at>
 ;; Maintainer: FSF
diff --git a/lisp/find-dired.el b/lisp/find-dired.el
index 027710f74c3..4b70a71bdb8 100644
--- a/lisp/find-dired.el
+++ b/lisp/find-dired.el
@@ -1,7 +1,7 @@
 ;;; find-dired.el --- run a `find' command and dired the output
 
 ;; Copyright (C) 1992, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>,
 ;;	   Sebastian Kremer <sk@thp.uni-koeln.de>
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 505789e5146..5b15e0d1692 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -5,7 +5,7 @@
 ;; Keywords: c, matching, tools
 
 ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/find-lisp.el b/lisp/find-lisp.el
index 2dfd8d2a6c6..18e30ef37eb 100644
--- a/lisp/find-lisp.el
+++ b/lisp/find-lisp.el
@@ -5,7 +5,7 @@
 ;; Keywords: unix
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/finder.el b/lisp/finder.el
index 1374e1f4e76..96a806a2e1e 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -1,7 +1,7 @@
 ;;; finder.el --- topic & keyword-based code finder
 
 ;; Copyright (C) 1992, 1997, 1998, 1999, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Created: 16 Jun 1992
diff --git a/lisp/flow-ctrl.el b/lisp/flow-ctrl.el
index f2a29cda43c..5ba5aa6be20 100644
--- a/lisp/flow-ctrl.el
+++ b/lisp/flow-ctrl.el
@@ -1,7 +1,7 @@
 ;;; flow-ctrl.el --- help for lusers on cu(1) or ttys with wired-in ^S/^Q flow control
 
 ;; Copyright (C) 1990, 1991, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author Kevin Gallagher
 ;; Maintainer: FSF
diff --git a/lisp/foldout.el b/lisp/foldout.el
index 540a1943271..73c8556ad5b 100644
--- a/lisp/foldout.el
+++ b/lisp/foldout.el
@@ -1,7 +1,7 @@
 ;;; foldout.el --- folding extensions for outline-mode and outline-minor-mode
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Broadey <KevinB@bartley.demon.co.uk>
 ;; Maintainer: FSF
diff --git a/lisp/follow.el b/lisp/follow.el
index c44b5156ec8..90555a786cc 100644
--- a/lisp/follow.el
+++ b/lisp/follow.el
@@ -1,7 +1,7 @@
 ;;; follow.el --- synchronize windows showing the same buffer
 
 ;; Copyright (C) 1995, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
 ;; Maintainer: FSF (Anders' email bounces, Sep 2005)
diff --git a/lisp/font-core.el b/lisp/font-core.el
index 6a3f2b7698f..8202a820008 100644
--- a/lisp/font-core.el
+++ b/lisp/font-core.el
@@ -1,7 +1,7 @@
 ;;; font-core.el --- Core interface to font-lock
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index dfd3ec33089..a1e103624b3 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1,7 +1,7 @@
 ;;; font-lock.el --- Electric font lock mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
diff --git a/lisp/format.el b/lisp/format.el
index 73f48fba7cd..287f2d7ce72 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -1,7 +1,7 @@
 ;;; format.el --- read and save files in multiple formats
 
 ;; Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 
diff --git a/lisp/forms-d2.el b/lisp/forms-d2.el
index 883cfe14d7c..c7e50ef15e0 100644
--- a/lisp/forms-d2.el
+++ b/lisp/forms-d2.el
@@ -1,7 +1,7 @@
 ;;; forms-d2.el --- demo forms-mode -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
 ;; Created: 1989
diff --git a/lisp/forms.el b/lisp/forms.el
index 63e208a127f..9f37ce04463 100644
--- a/lisp/forms.el
+++ b/lisp/forms.el
@@ -1,7 +1,7 @@
 ;;; forms.el --- Forms mode: edit a file as a form to fill in
 
 ;; Copyright (C) 1991, 1994, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans <jvromans@squirrel.nl>
 
diff --git a/lisp/frame.el b/lisp/frame.el
index bac533ae86f..5f32654fdb1 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,7 +1,7 @@
 ;;; frame.el --- multi-frame management independent of window systems
 
 ;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/fringe.el b/lisp/fringe.el
index 7a04d87a579..06df7f36388 100644
--- a/lisp/fringe.el
+++ b/lisp/fringe.el
@@ -1,6 +1,6 @@
 ;;; fringe.el --- fringe setup and control
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Maintainer: FSF
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index d980a1ebc89..3136889c250 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,7 +1,7 @@
 ;;; generic-x.el --- A collection of generic modes
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a56f9ff1536..7197ca2705f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,24 @@
+2007-01-23  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-score.el (gnus-home-score-file, gnus-home-adapt-file): Fix
+	custom choice.
+
+	* gnus-art.el (gnus-signature-limit): Fix custom choice.
+
+2007-01-19  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* nnsoup.el (nnsoup-directory, nnsoup-packer, nnsoup-packet-directory):
+	Use gnus-home-directory instead of "~/" or "$HOME".
+
+2007-01-12  Kenichi Handa  <handa@m17n.org>
+
+	* uudecode.el (uudecode-decode-region-internal): Make it work in a
+	multibyte buffer.
+
+2007-01-14  Reiner Steib  <Reiner.Steib@gmx.de>
+
+	* gnus-sum.el (gnus-auto-select-first): Improve doc string.
+
 2007-01-07  Reiner Steib  <Reiner.Steib@gmx.de>
 
 	* gnus-soup.el: Add missing :group in previous change.
@@ -4693,7 +4714,7 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+    Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/gnus/ChangeLog.1 b/lisp/gnus/ChangeLog.1
index 5f86d24e019..e4c39387d30 100644
--- a/lisp/gnus/ChangeLog.1
+++ b/lisp/gnus/ChangeLog.1
@@ -3727,7 +3727,7 @@
 
 
     Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-    2005, 2006 Free Software Foundation, Inc.
+    2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/gnus/ChangeLog.2 b/lisp/gnus/ChangeLog.2
index dcd6e8249b4..b20dc6646f4 100644
--- a/lisp/gnus/ChangeLog.2
+++ b/lisp/gnus/ChangeLog.2
@@ -18857,7 +18857,7 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006
+    Copyright (C) 2000, 2001, 2002, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
diff --git a/lisp/gnus/binhex.el b/lisp/gnus/binhex.el
index f01b2ff8b51..5bca0be13c2 100644
--- a/lisp/gnus/binhex.el
+++ b/lisp/gnus/binhex.el
@@ -1,7 +1,7 @@
 ;;; binhex.el --- elisp native binhex decode
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: binhex news
diff --git a/lisp/gnus/canlock.el b/lisp/gnus/canlock.el
index 9f063bb3644..3f51ad47ef0 100644
--- a/lisp/gnus/canlock.el
+++ b/lisp/gnus/canlock.el
@@ -1,7 +1,7 @@
 ;;; canlock.el --- functions for Cancel-Lock feature
 
 ;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Katsumi Yamaoka <yamaoka@jpl.org>
 ;; Keywords: news, cancel-lock, hmac, sha1, rfc2104
diff --git a/lisp/gnus/compface.el b/lisp/gnus/compface.el
index 33e05046e84..c146c93193b 100644
--- a/lisp/gnus/compface.el
+++ b/lisp/gnus/compface.el
@@ -1,6 +1,6 @@
 ;;; compface.el --- functions for converting X-Face headers
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/deuglify.el b/lisp/gnus/deuglify.el
index 53439d17091..f3052130e8f 100644
--- a/lisp/gnus/deuglify.el
+++ b/lisp/gnus/deuglify.el
@@ -1,6 +1,6 @@
 ;;; deuglify.el --- deuglify broken Outlook (Express) articles
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Raymond Scholz <rscholz@zonix.de>
diff --git a/lisp/gnus/dig.el b/lisp/gnus/dig.el
index e180cdad364..97f149c76e1 100644
--- a/lisp/gnus/dig.el
+++ b/lisp/gnus/dig.el
@@ -1,7 +1,7 @@
 ;;; dig.el --- Domain Name System dig interface
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS BIND dig
diff --git a/lisp/gnus/dns.el b/lisp/gnus/dns.el
index 5069230e736..e7cd51f0308 100644
--- a/lisp/gnus/dns.el
+++ b/lisp/gnus/dns.el
@@ -1,6 +1,6 @@
 ;;; dns.el --- Domain Name Service lookups
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: network
diff --git a/lisp/gnus/earcon.el b/lisp/gnus/earcon.el
index a70e68d9a62..8a3560fac08 100644
--- a/lisp/gnus/earcon.el
+++ b/lisp/gnus/earcon.el
@@ -1,7 +1,7 @@
 ;;; earcon.el --- Sound effects for messages
 
 ;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 
diff --git a/lisp/gnus/flow-fill.el b/lisp/gnus/flow-fill.el
index b47e9ba8365..4ab2645878f 100644
--- a/lisp/gnus/flow-fill.el
+++ b/lisp/gnus/flow-fill.el
@@ -1,7 +1,7 @@
 ;;; flow-fill.el --- interpret RFC2646 "flowed" text
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
diff --git a/lisp/gnus/format-spec.el b/lisp/gnus/format-spec.el
index e905e91c2e1..a01b3d0e052 100644
--- a/lisp/gnus/format-spec.el
+++ b/lisp/gnus/format-spec.el
@@ -1,7 +1,7 @@
 ;;; format-spec.el --- functions for formatting arbitrary formatting strings
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: tools
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el
index 18b1a528c29..84b69edb575 100644
--- a/lisp/gnus/gmm-utils.el
+++ b/lisp/gnus/gmm-utils.el
@@ -1,6 +1,6 @@
 ;;; gmm-utils.el --- Utility functions for Gnus, Message and MML
 
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Reiner Steib <reiner.steib@gmx.de>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-agent.el b/lisp/gnus/gnus-agent.el
index 64e080f5aa3..f54b568a7ef 100644
--- a/lisp/gnus/gnus-agent.el
+++ b/lisp/gnus/gnus-agent.el
@@ -1,7 +1,7 @@
 ;;; gnus-agent.el --- unplugged support for Gnus
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 9160f6f5002..e757406f00d 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1,7 +1,7 @@
 ;;; gnus-art.el --- article mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -242,7 +242,7 @@ regexp.  If it matches, the text in question is not a signature."
   :type '(choice (const nil)
 		 (integer :value 200)
 		 (number :value 4.0)
-		 (function :value fun)
+		 function
 		 (regexp :value ".*"))
   :group 'gnus-article-signature)
 
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index ba884185841..9b81e2e061d 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -1,7 +1,7 @@
 ;;; gnus-async.el --- asynchronous support for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-audio.el b/lisp/gnus/gnus-audio.el
index a3192d84f65..51cee19c873 100644
--- a/lisp/gnus/gnus-audio.el
+++ b/lisp/gnus/gnus-audio.el
@@ -1,7 +1,7 @@
 ;;; gnus-audio.el --- Sound effects for Gnus
 
 ;; Copyright (C) 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 ;; Keywords: news, mail, multimedia
diff --git a/lisp/gnus/gnus-bcklg.el b/lisp/gnus/gnus-bcklg.el
index e1456d8a9cd..5eb349fa980 100644
--- a/lisp/gnus/gnus-bcklg.el
+++ b/lisp/gnus/gnus-bcklg.el
@@ -1,7 +1,7 @@
 ;;; gnus-bcklg.el --- backlog functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-cache.el b/lisp/gnus/gnus-cache.el
index c95ef75ceb1..834dcbcc521 100644
--- a/lisp/gnus/gnus-cache.el
+++ b/lisp/gnus/gnus-cache.el
@@ -1,7 +1,7 @@
 ;;; gnus-cache.el --- cache interface for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-cite.el b/lisp/gnus/gnus-cite.el
index 44f54047be8..cb6a4c81fbb 100644
--- a/lisp/gnus/gnus-cite.el
+++ b/lisp/gnus/gnus-cite.el
@@ -1,7 +1,7 @@
 ;;; gnus-cite.el --- parse citations in articles for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abhiddenware
 
diff --git a/lisp/gnus/gnus-cus.el b/lisp/gnus/gnus-cus.el
index 5acad8f721b..80f810138e9 100644
--- a/lisp/gnus/gnus-cus.el
+++ b/lisp/gnus/gnus-cus.el
@@ -1,7 +1,7 @@
 ;;; gnus-cus.el --- customization commands for Gnus
 
 ;; Copyright (C) 1996, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-delay.el b/lisp/gnus/gnus-delay.el
index 9aab7d0996d..8113a11257b 100644
--- a/lisp/gnus/gnus-delay.el
+++ b/lisp/gnus/gnus-delay.el
@@ -1,6 +1,6 @@
 ;;; gnus-delay.el --- Delayed posting of articles
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;; Keywords: mail, news, extensions
diff --git a/lisp/gnus/gnus-demon.el b/lisp/gnus/gnus-demon.el
index 6df92620503..2ff32f5709f 100644
--- a/lisp/gnus/gnus-demon.el
+++ b/lisp/gnus/gnus-demon.el
@@ -1,7 +1,7 @@
 ;;; gnus-demon.el --- daemonic Gnus behaviour
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-diary.el b/lisp/gnus/gnus-diary.el
index 06d3d530df7..be4c73a2b4f 100644
--- a/lisp/gnus/gnus-diary.el
+++ b/lisp/gnus/gnus-diary.el
@@ -1,7 +1,7 @@
 ;;; gnus-diary.el --- Wrapper around the NNDiary Gnus backend
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
diff --git a/lisp/gnus/gnus-dired.el b/lisp/gnus/gnus-dired.el
index 8eda432f3f8..c1399ab0939 100644
--- a/lisp/gnus/gnus-dired.el
+++ b/lisp/gnus/gnus-dired.el
@@ -1,7 +1,7 @@
 ;;; gnus-dired.el --- utility functions where gnus and dired meet
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Authors: Benjamin Rutt <brutt@bloomington.in.us>,
 ;;          Shenghuo Zhu <zsh@cs.rochester.edu>
diff --git a/lisp/gnus/gnus-draft.el b/lisp/gnus/gnus-draft.el
index 013be410632..c946c699c8c 100644
--- a/lisp/gnus/gnus-draft.el
+++ b/lisp/gnus/gnus-draft.el
@@ -1,7 +1,7 @@
 ;;; gnus-draft.el --- draft message support for Gnus
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-dup.el b/lisp/gnus/gnus-dup.el
index 38420d51a18..574631f90a9 100644
--- a/lisp/gnus/gnus-dup.el
+++ b/lisp/gnus/gnus-dup.el
@@ -1,7 +1,7 @@
 ;;; gnus-dup.el --- suppression of duplicate articles in Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-eform.el b/lisp/gnus/gnus-eform.el
index be31e37c8fe..bbe95ce1cc4 100644
--- a/lisp/gnus/gnus-eform.el
+++ b/lisp/gnus/gnus-eform.el
@@ -1,7 +1,7 @@
 ;;; gnus-eform.el --- a mode for editing forms for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-ems.el b/lisp/gnus/gnus-ems.el
index 73bcf09f360..60e66adc98b 100644
--- a/lisp/gnus/gnus-ems.el
+++ b/lisp/gnus/gnus-ems.el
@@ -1,7 +1,7 @@
 ;;; gnus-ems.el --- functions for making Gnus work under different Emacsen
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-fun.el b/lisp/gnus/gnus-fun.el
index 4eb5cdd1c99..481aeab3847 100644
--- a/lisp/gnus/gnus-fun.el
+++ b/lisp/gnus/gnus-fun.el
@@ -1,6 +1,6 @@
 ;;; gnus-fun.el --- various frivolous extension functions to Gnus
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-gl.el b/lisp/gnus/gnus-gl.el
index 59214cec024..99d4d463e17 100644
--- a/lisp/gnus/gnus-gl.el
+++ b/lisp/gnus/gnus-gl.el
@@ -1,7 +1,7 @@
 ;;; gnus-gl.el --- an interface to GroupLens for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Brad Miller <bmiller@cs.umn.edu>
 ;; Keywords: news, score
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 3fe8d71f512..0494649ac8a 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1,7 +1,7 @@
 ;;; gnus-group.el --- group mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 8af0aa2cca2..faa2feb87c7 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -1,7 +1,7 @@
 ;;; gnus-int.el --- backend interface functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-kill.el b/lisp/gnus/gnus-kill.el
index cf8d9bc431c..2f42192c93c 100644
--- a/lisp/gnus/gnus-kill.el
+++ b/lisp/gnus/gnus-kill.el
@@ -1,7 +1,7 @@
 ;;; gnus-kill.el --- kill commands for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-logic.el b/lisp/gnus/gnus-logic.el
index b7091eda6f5..7a0ffaf549c 100644
--- a/lisp/gnus/gnus-logic.el
+++ b/lisp/gnus/gnus-logic.el
@@ -1,7 +1,7 @@
 ;;; gnus-logic.el --- advanced scoring code for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-mh.el b/lisp/gnus/gnus-mh.el
index 3c3dd501736..0a38f6234fd 100644
--- a/lisp/gnus/gnus-mh.el
+++ b/lisp/gnus/gnus-mh.el
@@ -1,7 +1,7 @@
 ;;; gnus-mh.el --- mh-e interface for Gnus
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-ml.el b/lisp/gnus/gnus-ml.el
index 8d475f968d7..71183dda259 100644
--- a/lisp/gnus/gnus-ml.el
+++ b/lisp/gnus/gnus-ml.el
@@ -1,7 +1,7 @@
 ;;; gnus-ml.el --- Mailing list minor mode for Gnus
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Julien Gilles  <jgilles@free.fr>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/gnus-mlspl.el b/lisp/gnus/gnus-mlspl.el
index cf2877caf0f..5e7644dd9e6 100644
--- a/lisp/gnus/gnus-mlspl.el
+++ b/lisp/gnus/gnus-mlspl.el
@@ -1,7 +1,7 @@
 ;;; gnus-mlspl.el --- a group params-based mail splitting mechanism
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/gnus-move.el b/lisp/gnus/gnus-move.el
index fafd266b81d..9cde3b9226d 100644
--- a/lisp/gnus/gnus-move.el
+++ b/lisp/gnus/gnus-move.el
@@ -1,7 +1,7 @@
 ;;; gnus-move.el --- commands for moving Gnus from one server to another
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 28a90b5b796..cace5028f96 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1,7 +1,7 @@
 ;;; gnus-msg.el --- mail and post interface for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-nocem.el b/lisp/gnus/gnus-nocem.el
index cfdaf137087..12914091ddd 100644
--- a/lisp/gnus/gnus-nocem.el
+++ b/lisp/gnus/gnus-nocem.el
@@ -1,7 +1,7 @@
 ;;; gnus-nocem.el --- NoCeM pseudo-cancellation treatment
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-picon.el b/lisp/gnus/gnus-picon.el
index 4f8d603c814..47ac9736a09 100644
--- a/lisp/gnus/gnus-picon.el
+++ b/lisp/gnus/gnus-picon.el
@@ -1,7 +1,7 @@
 ;;; gnus-picon.el --- displaying pretty icons in Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news xpm annotation glyph faces
diff --git a/lisp/gnus/gnus-range.el b/lisp/gnus/gnus-range.el
index 14355bc96af..adf6b85bb11 100644
--- a/lisp/gnus/gnus-range.el
+++ b/lisp/gnus/gnus-range.el
@@ -1,7 +1,7 @@
 ;;; gnus-range.el --- range and sequence functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-registry.el b/lisp/gnus/gnus-registry.el
index 47944aeef41..f32ed6f1414 100644
--- a/lisp/gnus/gnus-registry.el
+++ b/lisp/gnus/gnus-registry.el
@@ -1,7 +1,7 @@
 ;;; gnus-registry.el --- article registry for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ted Zlatanov <tzz@lifelogs.com>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index fd2411809b4..58ac1422dab 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -1,7 +1,7 @@
 ;;; gnus-salt.el --- alternate summary mode interfaces for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 642ca1aefa9..fd8fedd2011 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -1,7 +1,7 @@
 ;;; gnus-score.el --- scoring code for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <amanda@iesd.auc.dk>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
@@ -204,10 +204,10 @@ It can be:
   :type '(choice string
 		 (repeat (choice string
 				 (cons regexp (repeat file))
-				 (function :value fun)))
+				 function))
 		 (function-item gnus-hierarchial-home-score-file)
 		 (function-item gnus-current-home-score-file)
-		 (function :value fun)))
+		 function))
 
 (defcustom gnus-home-adapt-file nil
   "Variable to control where new adaptive score entries are to go.
@@ -217,8 +217,8 @@ This variable allows the same syntax as `gnus-home-score-file'."
   :type '(choice string
 		 (repeat (choice string
 				 (cons regexp (repeat file))
-				 (function :value fun)))
-		 (function :value fun)))
+				 function))
+		 function))
 
 (defcustom gnus-default-adaptive-score-alist
   `((gnus-kill-file-mark)
diff --git a/lisp/gnus/gnus-setup.el b/lisp/gnus/gnus-setup.el
index 8cdce45b7a9..3d3a2024d54 100644
--- a/lisp/gnus/gnus-setup.el
+++ b/lisp/gnus/gnus-setup.el
@@ -1,7 +1,7 @@
 ;;; gnus-setup.el --- Initialization & Setup for Gnus 5
 
 ;; Copyright (C) 1995, 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Steven L. Baur <steve@miranova.com>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-sieve.el b/lisp/gnus/gnus-sieve.el
index 0e6c500d0f2..7483c8bdc98 100644
--- a/lisp/gnus/gnus-sieve.el
+++ b/lisp/gnus/gnus-sieve.el
@@ -1,6 +1,6 @@
 ;;; gnus-sieve.el --- Utilities to manage sieve scripts for Gnus
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: NAGY Andras <nagya@inf.elte.hu>,
 ;;	Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/gnus-soup.el b/lisp/gnus/gnus-soup.el
index d5b1a9fad88..c4dcb48620d 100644
--- a/lisp/gnus/gnus-soup.el
+++ b/lisp/gnus/gnus-soup.el
@@ -1,7 +1,7 @@
 ;;; gnus-soup.el --- SOUP packet writing support for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@iesd.auc.dk>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-spec.el b/lisp/gnus/gnus-spec.el
index c6ffee78c77..b6fd0a2690c 100644
--- a/lisp/gnus/gnus-spec.el
+++ b/lisp/gnus/gnus-spec.el
@@ -1,7 +1,7 @@
 ;;; gnus-spec.el --- format spec functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index aabf8efbf6b..f6804f3b114 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -1,7 +1,7 @@
 ;;; gnus-srvr.el --- virtual server support for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index 22a807b77a7..9fbab8b340b 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -1,7 +1,7 @@
 ;;; gnus-start.el --- startup functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index 54745511129..5653c8be746 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1,7 +1,7 @@
 ;;; gnus-sum.el --- summary mode commands for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
@@ -304,12 +304,20 @@ equal will be included."
   :type 'boolean)
 
 (defcustom gnus-auto-select-first t
-  "*If non-nil, select the article under point.
-Which article this is is controlled by the `gnus-auto-select-subject'
-variable.
+  "If non-nil, select an article on group entry.
+An article is selected automatically when entering a group
+e.g. with \\<gnus-group-mode-map>\\[gnus-group-read-group], or via `gnus-summary-next-page' or
+`gnus-summary-catchup-and-goto-next-group'.
+
+Which article is selected is controlled by the variable
+`gnus-auto-select-subject'.
 
 If you want to prevent automatic selection of articles in some
 newsgroups, set the variable to nil in `gnus-select-group-hook'."
+  ;; Commands include...
+  ;; \\<gnus-group-mode-map>\\[gnus-group-read-group]
+  ;; \\<gnus-summary-mode-map>\\[gnus-summary-next-page]
+  ;; \\<gnus-summary-mode-map>\\[gnus-summary-catchup-and-goto-next-group]
   :group 'gnus-group-select
   :type '(choice (const :tag "none" nil)
 		 (sexp :menu-tag "first" t)))
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index 45585526bcf..381b89fe50f 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -1,7 +1,7 @@
 ;;; gnus-topic.el --- a folding minor mode for Gnus group buffers
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ilja Weis <kult@uni-paderborn.de>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/gnus-undo.el b/lisp/gnus/gnus-undo.el
index f7a3d1779d5..1c170fbd1c5 100644
--- a/lisp/gnus/gnus-undo.el
+++ b/lisp/gnus/gnus-undo.el
@@ -1,7 +1,7 @@
 ;;; gnus-undo.el --- minor mode for undoing in Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-util.el b/lisp/gnus/gnus-util.el
index b88a433b5fc..4f8e8539e88 100644
--- a/lisp/gnus/gnus-util.el
+++ b/lisp/gnus/gnus-util.el
@@ -1,7 +1,7 @@
 ;;; gnus-util.el --- utility functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index 46f810b2fbb..03491b3a4de 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -1,7 +1,7 @@
 ;;; gnus-uu.el --- extract (uu)encoded files in Gnus
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Created: 2 Oct 1993
diff --git a/lisp/gnus/gnus-vm.el b/lisp/gnus/gnus-vm.el
index 775e0aabf1d..000be4902e2 100644
--- a/lisp/gnus/gnus-vm.el
+++ b/lisp/gnus/gnus-vm.el
@@ -1,7 +1,7 @@
 ;;; gnus-vm.el --- vm interface for Gnus
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Persson <pp@gnu.ai.mit.edu>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/gnus-win.el b/lisp/gnus/gnus-win.el
index 42289109546..cfdfdbaf137 100644
--- a/lisp/gnus/gnus-win.el
+++ b/lisp/gnus/gnus-win.el
@@ -1,7 +1,7 @@
 ;;; gnus-win.el --- window configuration functions for Gnus
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 81f62d7036a..afb0724aca5 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1,7 +1,7 @@
 ;;; gnus.el --- a newsreader for GNU Emacs
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/hex-util.el b/lisp/gnus/hex-util.el
index 51553c2f8d1..ca2a6e09a3f 100644
--- a/lisp/gnus/hex-util.el
+++ b/lisp/gnus/hex-util.el
@@ -1,7 +1,7 @@
 ;;; hex-util.el --- Functions to encode/decode hexadecimal string.
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: data
diff --git a/lisp/gnus/html2text.el b/lisp/gnus/html2text.el
index 08044225ab4..0ecd1a37078 100644
--- a/lisp/gnus/html2text.el
+++ b/lisp/gnus/html2text.el
@@ -1,6 +1,6 @@
 ;;; html2text.el --- a simple html to plain text converter
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Joakim Hove <hove@phys.ntnu.no>
 
diff --git a/lisp/gnus/ietf-drums.el b/lisp/gnus/ietf-drums.el
index aace5f4f7e2..a67f7bbac28 100644
--- a/lisp/gnus/ietf-drums.el
+++ b/lisp/gnus/ietf-drums.el
@@ -1,7 +1,7 @@
 ;;; ietf-drums.el --- Functions for parsing RFC822bis headers
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/imap.el b/lisp/gnus/imap.el
index 16fce1843db..a52ad2e8eb4 100644
--- a/lisp/gnus/imap.el
+++ b/lisp/gnus/imap.el
@@ -1,7 +1,7 @@
 ;;; imap.el --- imap library
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
diff --git a/lisp/gnus/legacy-gnus-agent.el b/lisp/gnus/legacy-gnus-agent.el
index cc8e4e370f4..743f56e1687 100644
--- a/lisp/gnus/legacy-gnus-agent.el
+++ b/lisp/gnus/legacy-gnus-agent.el
@@ -1,6 +1,6 @@
 ;;; gnus-agent.el --- Legacy unplugged support for Gnus
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Greiner <kgreiner@xpediantsolutions.com>
 ;; Keywords: news
diff --git a/lisp/gnus/mail-parse.el b/lisp/gnus/mail-parse.el
index ae3bcb7270e..0ee9d5eef8c 100644
--- a/lisp/gnus/mail-parse.el
+++ b/lisp/gnus/mail-parse.el
@@ -1,7 +1,7 @@
 ;;; mail-parse.el --- Interface functions for parsing mail
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mail-prsvr.el b/lisp/gnus/mail-prsvr.el
index 9cb214d50a4..13b08664889 100644
--- a/lisp/gnus/mail-prsvr.el
+++ b/lisp/gnus/mail-prsvr.el
@@ -1,7 +1,7 @@
 ;;; mail-prsvr.el --- Interface variables for parsing mail
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mail-source.el b/lisp/gnus/mail-source.el
index e350468bea4..b991415342d 100644
--- a/lisp/gnus/mail-source.el
+++ b/lisp/gnus/mail-source.el
@@ -1,7 +1,7 @@
 ;;; mail-source.el --- functions for fetching mail
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index f0d93f38655..0b02539b5a3 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -1,7 +1,7 @@
 ;;; mailcap.el --- MIME media types configuration
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: William M. Perry <wmperry@aventail.com>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index f7d876c120f..0f9046756e1 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -1,7 +1,7 @@
 ;;; message.el --- composing mail and news messages
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
diff --git a/lisp/gnus/messcompat.el b/lisp/gnus/messcompat.el
index 1c56d5d8cf0..b3bdeba56c5 100644
--- a/lisp/gnus/messcompat.el
+++ b/lisp/gnus/messcompat.el
@@ -1,7 +1,7 @@
 ;;; messcompat.el --- making message mode compatible with mail mode
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, news
diff --git a/lisp/gnus/mm-bodies.el b/lisp/gnus/mm-bodies.el
index a10b8b28399..c701932ebf6 100644
--- a/lisp/gnus/mm-bodies.el
+++ b/lisp/gnus/mm-bodies.el
@@ -1,7 +1,7 @@
 ;;; mm-bodies.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 361c83cfa7c..6d52d8b2f16 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1,7 +1,7 @@
 ;;; mm-decode.el --- Functions for decoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-encode.el b/lisp/gnus/mm-encode.el
index 5ea2d7dd1b6..a744c3e8ba9 100644
--- a/lisp/gnus/mm-encode.el
+++ b/lisp/gnus/mm-encode.el
@@ -1,7 +1,7 @@
 ;;; mm-encode.el --- Functions for encoding MIME things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-extern.el b/lisp/gnus/mm-extern.el
index f4c728541e9..342ea9e9135 100644
--- a/lisp/gnus/mm-extern.el
+++ b/lisp/gnus/mm-extern.el
@@ -1,7 +1,7 @@
 ;;; mm-extern.el --- showing message/external-body
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message external-body
diff --git a/lisp/gnus/mm-partial.el b/lisp/gnus/mm-partial.el
index 69f8b1ff504..0669b391acf 100644
--- a/lisp/gnus/mm-partial.el
+++ b/lisp/gnus/mm-partial.el
@@ -1,7 +1,7 @@
 ;;; mm-partial.el --- showing message/partial
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: message partial
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 70584bdf50d..f42b2c940bb 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -1,6 +1,6 @@
 ;;; mm-url.el --- a wrapper of url functions/commands for Gnus
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 
diff --git a/lisp/gnus/mm-util.el b/lisp/gnus/mm-util.el
index 10cd78f71d9..742bbc223ae 100644
--- a/lisp/gnus/mm-util.el
+++ b/lisp/gnus/mm-util.el
@@ -1,7 +1,7 @@
 ;;; mm-util.el --- Utility functions for Mule and low level things
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 311dce0d1b2..26eae64777f 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -1,7 +1,7 @@
 ;;; mm-uu.el --- Return uu stuff as mm handles
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: postscript uudecode binhex shar forward gnatsweb pgp
diff --git a/lisp/gnus/mm-view.el b/lisp/gnus/mm-view.el
index 8b6d3e8e795..14d480fe7df 100644
--- a/lisp/gnus/mm-view.el
+++ b/lisp/gnus/mm-view.el
@@ -1,7 +1,7 @@
 ;;; mm-view.el --- functions for viewing MIME objects
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mml-sec.el b/lisp/gnus/mml-sec.el
index df301dc74b7..911ec41f883 100644
--- a/lisp/gnus/mml-sec.el
+++ b/lisp/gnus/mml-sec.el
@@ -1,7 +1,7 @@
 ;;; mml-sec.el --- A package with security functions for MML documents
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff --git a/lisp/gnus/mml-smime.el b/lisp/gnus/mml-smime.el
index 8115a78e618..2508259c29e 100644
--- a/lisp/gnus/mml-smime.el
+++ b/lisp/gnus/mml-smime.el
@@ -1,7 +1,7 @@
 ;;; mml-smime.el --- S/MIME support for MML
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: Gnus, MIME, S/MIME, MML
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 0ae4487f869..ae4de03edd0 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -1,7 +1,7 @@
 ;;; mml.el --- A package for parsing and validating MML documents
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/mml1991.el b/lisp/gnus/mml1991.el
index 4db3540aec1..af2599179ff 100644
--- a/lisp/gnus/mml1991.el
+++ b/lisp/gnus/mml1991.el
@@ -1,7 +1,7 @@
 ;;; mml1991.el --- Old PGP message format (RFC 1991) support for MML
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sascha Lüdecke <sascha@meta-x.de>,
 ;;	Simon Josefsson <simon@josefsson.org> (Mailcrypt interface, Gnus glue)
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 6c58272509e..a64f43fc9b5 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -1,7 +1,7 @@
 ;;; mml2015.el --- MIME Security with Pretty Good Privacy (PGP)
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: PGP MIME MML
diff --git a/lisp/gnus/nnagent.el b/lisp/gnus/nnagent.el
index d1c95bd2aa6..1f782c6067c 100644
--- a/lisp/gnus/nnagent.el
+++ b/lisp/gnus/nnagent.el
@@ -1,7 +1,7 @@
 ;;; nnagent.el --- offline backend for Gnus
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/nnbabyl.el b/lisp/gnus/nnbabyl.el
index f0c135b4cc9..61cbc16f9ac 100644
--- a/lisp/gnus/nnbabyl.el
+++ b/lisp/gnus/nnbabyl.el
@@ -1,7 +1,7 @@
 ;;; nnbabyl.el --- rmail mbox access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1099, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nndb.el b/lisp/gnus/nndb.el
index 7aa4edc7ab8..82244ea0d3a 100644
--- a/lisp/gnus/nndb.el
+++ b/lisp/gnus/nndb.el
@@ -1,7 +1,7 @@
 ;;; nndb.el --- nndb access for Gnus
 
 ;; Copyright (C) 1997, 1998, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;         Kai Grossjohann <grossjohann@ls6.informatik.uni-dortmund.de>
diff --git a/lisp/gnus/nndiary.el b/lisp/gnus/nndiary.el
index a569314d6d7..249a4fdb1ba 100644
--- a/lisp/gnus/nndiary.el
+++ b/lisp/gnus/nndiary.el
@@ -1,7 +1,7 @@
 ;;; nndiary.el --- A diary backend for Gnus
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:        Didier Verna <didier@xemacs.org>
 ;; Maintainer:    Didier Verna <didier@xemacs.org>
diff --git a/lisp/gnus/nndir.el b/lisp/gnus/nndir.el
index e821107cb48..a341b0886cf 100644
--- a/lisp/gnus/nndir.el
+++ b/lisp/gnus/nndir.el
@@ -1,7 +1,7 @@
 ;;; nndir.el --- single directory newsgroup access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nndoc.el b/lisp/gnus/nndoc.el
index 764f085e6a7..59d134346e4 100644
--- a/lisp/gnus/nndoc.el
+++ b/lisp/gnus/nndoc.el
@@ -1,7 +1,7 @@
 ;;; nndoc.el --- single file access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nndraft.el b/lisp/gnus/nndraft.el
index fa497e1c76f..de1a62767c5 100644
--- a/lisp/gnus/nndraft.el
+++ b/lisp/gnus/nndraft.el
@@ -1,7 +1,7 @@
 ;;; nndraft.el --- draft article access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nneething.el b/lisp/gnus/nneething.el
index 4b5f1871aa3..97f7091bea0 100644
--- a/lisp/gnus/nneething.el
+++ b/lisp/gnus/nneething.el
@@ -1,7 +1,7 @@
 ;;; nneething.el --- arbitrary file access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnfolder.el b/lisp/gnus/nnfolder.el
index bd9957283f4..534720598df 100644
--- a/lisp/gnus/nnfolder.el
+++ b/lisp/gnus/nnfolder.el
@@ -1,7 +1,7 @@
 ;;; nnfolder.el --- mail folder access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
 ;;      ShengHuo Zhu <zsh@cs.rochester.edu> (adding NOV)
diff --git a/lisp/gnus/nngateway.el b/lisp/gnus/nngateway.el
index 2f4e33d80ca..b478d10444b 100644
--- a/lisp/gnus/nngateway.el
+++ b/lisp/gnus/nngateway.el
@@ -1,7 +1,7 @@
 ;;; nngateway.el --- posting news via mail gateways
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/nnheader.el b/lisp/gnus/nnheader.el
index 82e1d3ab554..e7e8df8e547 100644
--- a/lisp/gnus/nnheader.el
+++ b/lisp/gnus/nnheader.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1993, 1994,
 ;;   1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index 5c0777531c5..0e815eac8a5 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1,7 +1,7 @@
 ;;; nnimap.el --- imap backend for Gnus
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;;         Jim Radford <radford@robby.caltech.edu>
diff --git a/lisp/gnus/nnkiboze.el b/lisp/gnus/nnkiboze.el
index dd4434553e6..f583f32a22a 100644
--- a/lisp/gnus/nnkiboze.el
+++ b/lisp/gnus/nnkiboze.el
@@ -1,7 +1,7 @@
 ;;; nnkiboze.el --- select virtual news access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnlistserv.el b/lisp/gnus/nnlistserv.el
index 2c77b028bb5..980ade935b6 100644
--- a/lisp/gnus/nnlistserv.el
+++ b/lisp/gnus/nnlistserv.el
@@ -1,7 +1,7 @@
 ;;; nnlistserv.el --- retrieving articles via web mailing list archives
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/nnmail.el b/lisp/gnus/nnmail.el
index 98af7ba41f2..736e58cd5a2 100644
--- a/lisp/gnus/nnmail.el
+++ b/lisp/gnus/nnmail.el
@@ -1,7 +1,7 @@
 ;;; nnmail.el --- mail support functions for the Gnus mail backends
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/nnmbox.el b/lisp/gnus/nnmbox.el
index 7d75f655337..7e89d53d96f 100644
--- a/lisp/gnus/nnmbox.el
+++ b/lisp/gnus/nnmbox.el
@@ -1,7 +1,7 @@
 ;;; nnmbox.el --- mail mbox access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnmh.el b/lisp/gnus/nnmh.el
index afcee98299c..100281e140a 100644
--- a/lisp/gnus/nnmh.el
+++ b/lisp/gnus/nnmh.el
@@ -1,7 +1,7 @@
 ;;; nnmh.el --- mhspool access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
diff --git a/lisp/gnus/nnml.el b/lisp/gnus/nnml.el
index 2cc8023366b..7a0209daa62 100644
--- a/lisp/gnus/nnml.el
+++ b/lisp/gnus/nnml.el
@@ -1,7 +1,7 @@
 ;;; nnml.el --- mail spool access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org> (adding MARKS)
 ;;      Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnoo.el b/lisp/gnus/nnoo.el
index 122183057b9..22ec1c313ea 100644
--- a/lisp/gnus/nnoo.el
+++ b/lisp/gnus/nnoo.el
@@ -1,7 +1,7 @@
 ;;; nnoo.el --- OO Gnus Backends
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnrss.el b/lisp/gnus/nnrss.el
index f21fd74d138..996783e69b6 100644
--- a/lisp/gnus/nnrss.el
+++ b/lisp/gnus/nnrss.el
@@ -1,7 +1,7 @@
 ;;; nnrss.el --- interfacing with RSS
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: RSS
diff --git a/lisp/gnus/nnslashdot.el b/lisp/gnus/nnslashdot.el
index 0b19fd0ead6..28fd34b0da0 100644
--- a/lisp/gnus/nnslashdot.el
+++ b/lisp/gnus/nnslashdot.el
@@ -1,7 +1,7 @@
 ;;; nnslashdot.el --- interfacing with Slashdot
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnsoup.el b/lisp/gnus/nnsoup.el
index e520121a266..e51f0d5d8bb 100644
--- a/lisp/gnus/nnsoup.el
+++ b/lisp/gnus/nnsoup.el
@@ -1,7 +1,7 @@
 ;;; nnsoup.el --- SOUP access for Gnus
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
@@ -37,7 +37,7 @@
 
 (nnoo-declare nnsoup)
 
-(defvoo nnsoup-directory "~/SOUP/"
+(defvoo nnsoup-directory (nnheader-concat gnus-home-directory "SOUP/")
   "*SOUP packet directory.")
 
 (defvoo nnsoup-tmp-directory
@@ -58,7 +58,9 @@
 (defvoo nnsoup-active-file (expand-file-name "active" nnsoup-directory)
   "Active file.")
 
-(defvoo nnsoup-packer "tar cf - %s | gzip > $HOME/Soupin%d.tgz"
+(defvoo nnsoup-packer (concat "tar cf - %s | gzip > "
+			      (expand-file-name gnus-home-directory)
+			      "Soupin%d.tgz")
   "Format string command for packing a SOUP packet.
 The SOUP files will be inserted where the %s is in the string.
 This string MUST contain both %s and %d.  The file number will be
@@ -68,7 +70,7 @@ inserted where %d appears.")
   "*Format string command for unpacking a SOUP packet.
 The SOUP packet file name will be inserted at the %s.")
 
-(defvoo nnsoup-packet-directory "~/"
+(defvoo nnsoup-packet-directory gnus-home-directory
   "*Where nnsoup will look for incoming packets.")
 
 (defvoo nnsoup-packet-regexp "Soupout"
diff --git a/lisp/gnus/nnspool.el b/lisp/gnus/nnspool.el
index 329b35ad867..fd5076be360 100644
--- a/lisp/gnus/nnspool.el
+++ b/lisp/gnus/nnspool.el
@@ -1,7 +1,7 @@
 ;;; nnspool.el --- spool access for GNU Emacs
 
 ;; Copyright (C) 1988, 1989, 1990, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@flab.flab.fujitsu.junet>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nntp.el b/lisp/gnus/nntp.el
index c5ab7da7b2b..867ea5419f2 100644
--- a/lisp/gnus/nntp.el
+++ b/lisp/gnus/nntp.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1987, 1988, 1989, 1990, 1992, 1993,
 ;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnultimate.el b/lisp/gnus/nnultimate.el
index 53522c099e5..0a95039fa18 100644
--- a/lisp/gnus/nnultimate.el
+++ b/lisp/gnus/nnultimate.el
@@ -1,7 +1,7 @@
 ;;; nnultimate.el --- interfacing with the Ultimate Bulletin Board system
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnvirtual.el b/lisp/gnus/nnvirtual.el
index ba1b6445623..4e0604903cc 100644
--- a/lisp/gnus/nnvirtual.el
+++ b/lisp/gnus/nnvirtual.el
@@ -1,7 +1,7 @@
 ;;; nnvirtual.el --- virtual newsgroups access for Gnus
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Moore <dmoore@ucsd.edu>
 ;;	Lars Magne Ingebrigtsen <larsi@gnus.org>
diff --git a/lisp/gnus/nnwarchive.el b/lisp/gnus/nnwarchive.el
index c110553a854..29f30ff487c 100644
--- a/lisp/gnus/nnwarchive.el
+++ b/lisp/gnus/nnwarchive.el
@@ -1,7 +1,7 @@
 ;;; nnwarchive.el --- interfacing with web archives
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news egroups mail-archive
diff --git a/lisp/gnus/nnweb.el b/lisp/gnus/nnweb.el
index 54c57879d5b..088aeee3bd5 100644
--- a/lisp/gnus/nnweb.el
+++ b/lisp/gnus/nnweb.el
@@ -1,7 +1,7 @@
 ;;; nnweb.el --- retrieving articles via web search engines
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/nnwfm.el b/lisp/gnus/nnwfm.el
index 90bf4e9c79d..22b1e8e2a29 100644
--- a/lisp/gnus/nnwfm.el
+++ b/lisp/gnus/nnwfm.el
@@ -1,7 +1,7 @@
 ;;; nnwfm.el --- interfacing with a web forum
 
 ;; Copyright (C) 2000, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/gnus/pop3.el b/lisp/gnus/pop3.el
index 4b376957377..333fb197b4d 100644
--- a/lisp/gnus/pop3.el
+++ b/lisp/gnus/pop3.el
@@ -1,7 +1,7 @@
 ;;; pop3.el --- Post Office Protocol (RFC 1460) interface
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net>
 ;; Maintainer: FSF
diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 15914922d1c..26e3077c64d 100644
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,7 +1,7 @@
 ;;; qp.el --- Quoted-Printable functions
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
diff --git a/lisp/gnus/rfc1843.el b/lisp/gnus/rfc1843.el
index 527769d4c83..183a7c6d2a6 100644
--- a/lisp/gnus/rfc1843.el
+++ b/lisp/gnus/rfc1843.el
@@ -1,7 +1,7 @@
 ;;; rfc1843.el --- HZ (rfc1843) decoding
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: news HZ HZ+ mail i18n
diff --git a/lisp/gnus/rfc2045.el b/lisp/gnus/rfc2045.el
index d41af595c94..d022cd1ca40 100644
--- a/lisp/gnus/rfc2045.el
+++ b/lisp/gnus/rfc2045.el
@@ -1,7 +1,7 @@
 ;;; rfc2045.el --- Functions for decoding rfc2045 headers
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/rfc2047.el b/lisp/gnus/rfc2047.el
index 4fd60ed8f74..6dc432daf79 100644
--- a/lisp/gnus/rfc2047.el
+++ b/lisp/gnus/rfc2047.el
@@ -1,7 +1,7 @@
 ;;; rfc2047.el --- functions for encoding and decoding rfc2047 messages
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;;	MORIOKA Tomohiko <morioka@jaist.ac.jp>
diff --git a/lisp/gnus/rfc2104.el b/lisp/gnus/rfc2104.el
index e24506ef363..8af59e00a3b 100644
--- a/lisp/gnus/rfc2104.el
+++ b/lisp/gnus/rfc2104.el
@@ -1,7 +1,7 @@
 ;;; rfc2104.el --- RFC2104 Hashed Message Authentication Codes
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: mail
diff --git a/lisp/gnus/rfc2231.el b/lisp/gnus/rfc2231.el
index b054b1f9282..e450d96a298 100644
--- a/lisp/gnus/rfc2231.el
+++ b/lisp/gnus/rfc2231.el
@@ -1,7 +1,7 @@
 ;;; rfc2231.el --- Functions for decoding rfc2231 headers
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; This file is part of GNU Emacs.
diff --git a/lisp/gnus/score-mode.el b/lisp/gnus/score-mode.el
index 3e604ab39d6..18ccb381cb0 100644
--- a/lisp/gnus/score-mode.el
+++ b/lisp/gnus/score-mode.el
@@ -1,7 +1,7 @@
 ;;; score-mode.el --- mode for editing Gnus score files
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news, mail
diff --git a/lisp/gnus/sha1.el b/lisp/gnus/sha1.el
index 664933bfec1..78d58a48efb 100644
--- a/lisp/gnus/sha1.el
+++ b/lisp/gnus/sha1.el
@@ -1,7 +1,7 @@
 ;;; sha1.el --- SHA1 Secure Hash Algorithm in Emacs-Lisp
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
 ;; Keywords: SHA1, FIPS 180-1
diff --git a/lisp/gnus/sieve-manage.el b/lisp/gnus/sieve-manage.el
index 3512ed15b2d..7272760932d 100644
--- a/lisp/gnus/sieve-manage.el
+++ b/lisp/gnus/sieve-manage.el
@@ -1,7 +1,7 @@
 ;;; sieve-manage.el --- Implementation of the managesive protocol in elisp
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff --git a/lisp/gnus/sieve-mode.el b/lisp/gnus/sieve-mode.el
index b58435693bf..e4223823276 100644
--- a/lisp/gnus/sieve-mode.el
+++ b/lisp/gnus/sieve-mode.el
@@ -1,7 +1,7 @@
 ;;; sieve-mode.el --- Sieve code editing commands for Emacs
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff --git a/lisp/gnus/sieve.el b/lisp/gnus/sieve.el
index b39ed5c78e6..124db9660ed 100644
--- a/lisp/gnus/sieve.el
+++ b/lisp/gnus/sieve.el
@@ -1,6 +1,6 @@
 ;;; sieve.el --- Utilities to manage sieve scripts
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 
diff --git a/lisp/gnus/smiley.el b/lisp/gnus/smiley.el
index 6476340f7bf..e74d6ddee6f 100644
--- a/lisp/gnus/smiley.el
+++ b/lisp/gnus/smiley.el
@@ -1,7 +1,7 @@
 ;;; smiley.el --- displaying smiley faces
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: news mail multimedia
diff --git a/lisp/gnus/smime.el b/lisp/gnus/smime.el
index e5a2328f9d6..112e32956fb 100644
--- a/lisp/gnus/smime.el
+++ b/lisp/gnus/smime.el
@@ -1,7 +1,7 @@
 ;;; smime.el --- S/MIME support library
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: SMIME X.509 PEM OpenSSL
diff --git a/lisp/gnus/spam-report.el b/lisp/gnus/spam-report.el
index a5f46bb79f4..16d096c572c 100644
--- a/lisp/gnus/spam-report.el
+++ b/lisp/gnus/spam-report.el
@@ -1,6 +1,6 @@
 ;;; spam-report.el --- Reporting spam
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Teodor Zlatanov <tzz@lifelogs.com>
 ;; Keywords: network
diff --git a/lisp/gnus/spam-stat.el b/lisp/gnus/spam-stat.el
index e21372bd649..8c67343ac38 100644
--- a/lisp/gnus/spam-stat.el
+++ b/lisp/gnus/spam-stat.el
@@ -1,6 +1,6 @@
 ;;; spam-stat.el --- detecting spam based on statistics
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
 ;; Keywords: network
diff --git a/lisp/gnus/spam.el b/lisp/gnus/spam.el
index 589b2b0a619..512192857ab 100644
--- a/lisp/gnus/spam.el
+++ b/lisp/gnus/spam.el
@@ -1,6 +1,6 @@
 ;;; spam.el --- Identifying spam
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: network
diff --git a/lisp/gnus/starttls.el b/lisp/gnus/starttls.el
index 229d6dca9f8..3b0a8d2b619 100644
--- a/lisp/gnus/starttls.el
+++ b/lisp/gnus/starttls.el
@@ -1,7 +1,7 @@
 ;;; starttls.el --- STARTTLS functions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Author: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/gnus/utf7.el b/lisp/gnus/utf7.el
index 8c761602ce0..4cae4fd0032 100644
--- a/lisp/gnus/utf7.el
+++ b/lisp/gnus/utf7.el
@@ -1,7 +1,7 @@
 ;;; utf7.el --- UTF-7 encoding/decoding for Emacs   -*-coding: iso-8859-1;-*-
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jon K Hellan <hellan@acm.org>
 ;; Maintainer: bugs@gnus.org
diff --git a/lisp/gnus/uudecode.el b/lisp/gnus/uudecode.el
index 616348e899f..41b8c228d1c 100644
--- a/lisp/gnus/uudecode.el
+++ b/lisp/gnus/uudecode.el
@@ -1,7 +1,7 @@
 ;;; uudecode.el -- elisp native uudecode
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: uudecode news
@@ -205,7 +205,10 @@ If FILE-NAME is non-nil, save the result to FILE-NAME."
 		(insert (apply 'concat (nreverse result)))))
 	  (or (markerp end) (setq end (set-marker (make-marker) end)))
 	  (goto-char start)
-	  (insert (apply 'concat (nreverse result)))
+	  (if enable-multibyte-characters
+	      (mapc #'(lambda (x) (insert (string-to-multibyte x)))
+		    (nreverse result))
+	    (insert (apply 'concat (nreverse result))))
 	  (delete-region (point) end))))))
 
 ;;;###autoload
diff --git a/lisp/gnus/webmail.el b/lisp/gnus/webmail.el
index 304a206a97f..272ea2017ff 100644
--- a/lisp/gnus/webmail.el
+++ b/lisp/gnus/webmail.el
@@ -1,7 +1,7 @@
 ;;; webmail.el --- interface of web mail
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Shenghuo Zhu <zsh@cs.rochester.edu>
 ;; Keywords: hotmail netaddress my-deja netscape
diff --git a/lisp/gnus/yenc.el b/lisp/gnus/yenc.el
index 767d2620cfe..4b01612d04c 100644
--- a/lisp/gnus/yenc.el
+++ b/lisp/gnus/yenc.el
@@ -1,6 +1,6 @@
 ;;; yenc.el --- elisp native yenc decoder
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jesper Harder <harder@ifa.au.dk>
 ;; Keywords: yenc news
diff --git a/lisp/gs.el b/lisp/gs.el
index 4594fb00bc2..ca58ce9c642 100644
--- a/lisp/gs.el
+++ b/lisp/gs.el
@@ -1,7 +1,7 @@
 ;;; gs.el --- interface to Ghostscript
 
 ;; Copyright (C) 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/help-at-pt.el b/lisp/help-at-pt.el
index 6d33c155c64..562102217da 100644
--- a/lisp/help-at-pt.el
+++ b/lisp/help-at-pt.el
@@ -1,6 +1,6 @@
 ;;; help-at-pt.el --- local help through the keyboard
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Luc Teirlinck <teirllm@auburn.edu>
 ;; Keywords: help
diff --git a/lisp/help-fns.el b/lisp/help-fns.el
index d9ffcbf742f..e03d98652ab 100644
--- a/lisp/help-fns.el
+++ b/lisp/help-fns.el
@@ -1,7 +1,7 @@
 ;;; help-fns.el --- Complex help functions
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
@@ -561,7 +561,11 @@ it is displayed along with the global value."
 		;; of a symbol.
 		(set-syntax-table emacs-lisp-mode-syntax-table)
 		(goto-char val-start-pos)
-		(delete-region (point) (progn (end-of-line) (point)))
+		;; The line below previously read as
+		;; (delete-region (point) (progn (end-of-line) (point)))
+		;; which suppressed display of the buffer local value for
+		;; large values.
+		(when (looking-at "value is") (replace-match ""))
 		(save-excursion
 		  (insert "\n\nValue:")
 		  (set (make-local-variable 'help-button-cache)
@@ -571,7 +575,7 @@ it is displayed along with the global value."
 			       'action help-button-cache
 			       'follow-link t
 			       'help-echo "mouse-2, RET: show value")
-		(insert ".\n\n")))
+		(insert ".\n")))
 
  	    ;; Mention if it's an alias
             (let* ((alias (condition-case nil
diff --git a/lisp/help-macro.el b/lisp/help-macro.el
index 971b97f71bb..e76eaaa9191 100644
--- a/lisp/help-macro.el
+++ b/lisp/help-macro.el
@@ -1,7 +1,7 @@
 ;;; help-macro.el --- makes command line help such as help-for-help
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lynn Slater <lrs@indetech.com>
 ;; Maintainer: FSF
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index ce79e618cd5..afaf06bec3c 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -1,7 +1,7 @@
 ;;; help-mode.el --- `help-mode' used by *Help* buffers
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
diff --git a/lisp/help.el b/lisp/help.el
index 8c0f92f48ff..8aa9ba6c46b 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1,7 +1,7 @@
 ;;; help.el --- help commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1993, 1994, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
diff --git a/lisp/hexl.el b/lisp/hexl.el
index 39c313cb3da..f63ed0aafa5 100644
--- a/lisp/hexl.el
+++ b/lisp/hexl.el
@@ -1,7 +1,7 @@
 ;;; hexl.el --- edit a file in a hex dump format using the hexl filter
 
 ;; Copyright (C) 1989, 1994, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Keith Gabryelski <ag@wheaties.ai.mit.edu>
 ;; Maintainer: FSF
@@ -283,6 +283,7 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (setq font-lock-defaults '(hexl-font-lock-keywords t))
 
     ;; Add hooks to rehexlify or dehexlify on various events.
+    (add-hook 'before-revert-hook 'hexl-before-revert-hook nil t)
     (add-hook 'after-revert-hook 'hexl-after-revert-hook nil t)
 
     (add-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer nil t)
@@ -317,10 +318,11 @@ You can use \\[hexl-find-file] to visit a file in Hexl mode.
     (let ((isearch-search-fun-function nil))
       (isearch-search-fun))))
 
+(defun hexl-before-revert-hook ()
+  (remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t))
+
 (defun hexl-after-revert-hook ()
-  (setq hexl-max-address (1- (buffer-size)))
-  (hexlify-buffer)
-  (set-buffer-modified-p nil))
+  (hexl-mode))
 
 (defvar hexl-in-save-buffer nil)
 
@@ -386,6 +388,7 @@ With arg, don't unhexlify buffer."
 	  (or (bobp) (setq original-point (1+ original-point))))
 	(goto-char original-point)))
 
+  (remove-hook 'before-revert-hook 'hexl-before-revert-hook t)
   (remove-hook 'after-revert-hook 'hexl-after-revert-hook t)
   (remove-hook 'change-major-mode-hook 'hexl-maybe-dehexlify-buffer t)
   (remove-hook 'post-command-hook 'hexl-follow-ascii-find t)
@@ -400,9 +403,9 @@ With arg, don't unhexlify buffer."
       (hl-line-mode 0))
   (when (boundp 'hexl-mode-old-hl-line-range-function)
     (setq hl-line-range-function hexl-mode-old-hl-line-range-function))
-  (when (boundp hexl-mode-old-hl-line-face)
+  (when (boundp 'hexl-mode-old-hl-line-face)
     (setq hl-line-face hexl-mode-old-hl-line-face))
- 
+
   (setq require-final-newline hexl-mode-old-require-final-newline)
   (setq mode-name hexl-mode-old-mode-name)
   (setq isearch-search-fun-function hexl-mode-old-isearch-search-fun-function)
@@ -706,10 +709,10 @@ You may also type octal digits, to insert a character with that code."
   "Convert a binary buffer to hexl format.
 This discards the buffer's undo information."
   (interactive)
-  (and buffer-undo-list
+  (and (consp buffer-undo-list)
        (or (y-or-n-p "Converting to hexl format discards undo info; ok? ")
-	   (error "Aborted")))
-  (setq buffer-undo-list nil)
+	   (error "Aborted"))
+       (setq buffer-undo-list nil))
   ;; Don't decode text in the ASCII part of `hexl' program output.
   (let ((coding-system-for-read 'raw-text)
 	(coding-system-for-write buffer-file-coding-system)
@@ -731,10 +734,10 @@ This discards the buffer's undo information."
   "Convert a hexl format buffer to binary.
 This discards the buffer's undo information."
   (interactive)
-  (and buffer-undo-list
+  (and (consp buffer-undo-list)
        (or (y-or-n-p "Converting from hexl format discards undo info; ok? ")
-	   (error "Aborted")))
-  (setq buffer-undo-list nil)
+	   (error "Aborted"))
+       (setq buffer-undo-list nil))
   (let ((coding-system-for-write 'raw-text)
 	(coding-system-for-read buffer-file-coding-system)
 	(buffer-undo-list t))
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index fcba2466d01..26451faf1ce 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -1,7 +1,7 @@
 ;;; hi-lock.el --- minor mode for interactive automatic highlighting
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David M. Koppelman, koppel@ee.lsu.edu
 ;; Keywords: faces, minor-mode, matching, display
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el
index cb79f673408..c867bcfaf08 100644
--- a/lisp/hilit-chg.el
+++ b/lisp/hilit-chg.el
@@ -1,7 +1,7 @@
 ;;; hilit-chg.el --- minor mode displaying buffer changes with special face
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Sharman <rsharman@pobox.com>
 ;; Keywords: faces
diff --git a/lisp/hippie-exp.el b/lisp/hippie-exp.el
index 28cfcf3b4ed..49d77543123 100644
--- a/lisp/hippie-exp.el
+++ b/lisp/hippie-exp.el
@@ -1,7 +1,7 @@
 ;;; hippie-exp.el --- expand text trying various ways to find its expansion
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Anders Holst <aho@sans.kth.se>
 ;; Last change: 3 March 1998
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 757a398086d..54f2e00b0ae 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -1,7 +1,7 @@
 ;;; hl-line.el --- highlight the current line
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:  Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/ibuf-ext.el b/lisp/ibuf-ext.el
index 4ab7b9eda41..6628a07bd29 100644
--- a/lisp/ibuf-ext.el
+++ b/lisp/ibuf-ext.el
@@ -1,7 +1,7 @@
 ;;; ibuf-ext.el --- extensions for ibuffer
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff --git a/lisp/ibuf-macs.el b/lisp/ibuf-macs.el
index 009935e1539..f84b84cfd4d 100644
--- a/lisp/ibuf-macs.el
+++ b/lisp/ibuf-macs.el
@@ -1,7 +1,7 @@
 ;;; ibuf-macs.el --- macros for ibuffer
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 04672f6e29f..cdb00ef2fba 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -1,7 +1,7 @@
 ;;; ibuffer.el --- operate on buffers like dired
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Colin Walters <walters@verbum.org>
 ;; Maintainer: John Paul Wallington <jpw@gnu.org>
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 8c1ee3ad64c..3ee53a821bf 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -1,7 +1,7 @@
 ;;; icomplete.el --- minibuffer completion incremental feedback
 
 ;; Copyright (C) 1992, 1993, 1994, 1997, 1999, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ken Manheimer <klm@i.am>
 ;; Maintainer: Ken Manheimer <klm@i.am>
diff --git a/lisp/ido.el b/lisp/ido.el
index e02028e526c..10418d209aa 100644
--- a/lisp/ido.el
+++ b/lisp/ido.el
@@ -1,7 +1,7 @@
 ;;; ido.el --- interactively do things with buffers and files.
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Based on: iswitchb by Stephen Eglen <stephen@cns.ed.ac.uk>
@@ -1040,6 +1040,10 @@ so that it doesn't interfere with other minibuffer usage.")
 (defvar ido-incomplete-regexp nil
   "Non-nil if an incomplete regexp is entered.")
 
+(defvar ido-initial-position nil
+  "Non-nil means to explicitly cursor on entry to minibuffer.
+Value is an integer which is number of chars to right of prompt.")
+
 ;;; Variables with dynamic bindings.
 ;;; Declared here to keep the byte compiler quiet.
 
@@ -1119,7 +1123,9 @@ so that it doesn't interfere with other minibuffer usage.")
 (defun ido-active (&optional merge)
   (if merge
       ido-use-merged-list
-    (and (boundp 'ido-completing-read) (= ido-use-mycompletion-depth (minibuffer-depth)))))
+    (and (boundp 'ido-completing-read)
+	 (or (featurep 'xemacs)
+	     (= ido-use-mycompletion-depth (minibuffer-depth))))))
 
 (defvar ido-trace-enable nil)
 
@@ -1850,6 +1856,8 @@ If INITIAL is non-nil, it specifies the initial input string."
 	(if (member ido-default-item ido-ignore-item-temp-list)
 	    (setq ido-default-item nil))
 	(ido-trace "new default" ido-default-item)
+	(if ido-default-item
+	    (setq ido-initial-position 0))
 	(setq ido-set-default-item nil))
 
       (if ido-process-ignore-lists-inhibit
@@ -2120,11 +2128,14 @@ If INITIAL is non-nil, it specifies the initial input string."
     ido-selected))
 
 (defun ido-edit-input ()
-  "Edit absolute file name entered so far with ido; terminate by RET."
+  "Edit absolute file name entered so far with ido; terminate by RET.
+If cursor is not at the end of the user input, move to end of input."
   (interactive)
-  (setq ido-text-init (if ido-matches (ido-name (car ido-matches)) ido-text))
-  (setq ido-exit 'edit)
-  (exit-minibuffer))
+  (if (not (eobp))
+      (end-of-line)
+    (setq ido-text-init (if ido-matches (ido-name (car ido-matches)) ido-text))
+    (setq ido-exit 'edit)
+    (exit-minibuffer)))
 
 ;;; MAIN FUNCTIONS
 (defun ido-buffer-internal (method &optional fallback prompt default initial switch-cmd)
@@ -2542,6 +2553,10 @@ C-x C-b C-b  fallback to non-ido `switch-to-buffer'."
   (cond
    ((> (point) (minibuffer-prompt-end))
     (forward-char -1))
+   ((eq last-command this-command)
+    (when (and (memq ido-cur-item '(file dir))
+	       (not (bobp)))
+      (ido-push-dir))) ; else do nothing
    ((eq ido-cur-item 'buffer)
     (ido-fallback-command))
    (ido-context-switch-command
@@ -2591,14 +2606,16 @@ C-x C-f ... C-d  enter dired on current directory."
 (defun ido-toggle-ignore ()
   "Toggle ignoring files specified with `ido-ignore-files'."
   (interactive)
-  (if ido-directory-too-big
-      (progn
-	(message "Reading directory...")
-	(setq ido-directory-too-big nil))
-    (setq ido-process-ignore-lists (not ido-process-ignore-lists)))
-  (setq ido-text-init ido-text)
-  (setq ido-exit 'refresh)
-  (exit-minibuffer))
+  (if (and (not (eobp)) (> (point) (minibuffer-prompt-end)))
+      (goto-char (minibuffer-prompt-end))
+    (if ido-directory-too-big
+	(progn
+	  (message "Reading directory...")
+	  (setq ido-directory-too-big nil))
+      (setq ido-process-ignore-lists (not ido-process-ignore-lists)))
+    (setq ido-text-init ido-text)
+    (setq ido-exit 'refresh)
+    (exit-minibuffer)))
 
 (defun ido-toggle-vc ()
   "Disable version control for this file."
@@ -3783,39 +3800,45 @@ for first matching file."
 
 ;;; KILL CURRENT BUFFER
 (defun ido-kill-buffer-at-head ()
-  "Kill the buffer at the head of `ido-matches'."
+  "Kill the buffer at the head of `ido-matches'.
+If cursor is not at the end of the user input, delete to end of input."
   (interactive)
-  (let ((enable-recursive-minibuffers t)
-	(buf (ido-name (car ido-matches))))
-    (when buf
-      (kill-buffer buf)
-      ;; Check if buffer still exists.
-      (if (get-buffer buf)
-	  ;; buffer couldn't be killed.
-	  (setq ido-rescan t)
-	;; else buffer was killed so remove name from list.
-	(setq ido-cur-list (delq buf ido-cur-list))))))
+  (if (not (eobp))
+      (kill-line)
+    (let ((enable-recursive-minibuffers t)
+	  (buf (ido-name (car ido-matches))))
+      (when buf
+	(kill-buffer buf)
+	;; Check if buffer still exists.
+	(if (get-buffer buf)
+	    ;; buffer couldn't be killed.
+	    (setq ido-rescan t)
+	  ;; else buffer was killed so remove name from list.
+	  (setq ido-cur-list (delq buf ido-cur-list)))))))
 
 ;;; DELETE CURRENT FILE
 (defun ido-delete-file-at-head ()
-  "Delete the file at the head of `ido-matches'."
+  "Delete the file at the head of `ido-matches'.
+If cursor is not at the end of the user input, delete to end of input."
   (interactive)
-  (let ((enable-recursive-minibuffers t)
-	(file (ido-name (car ido-matches))))
-    (if file
-	(setq file (concat ido-current-directory file)))
-    (when (and file
-	       (file-exists-p file)
-	       (not (file-directory-p file))
-	       (file-writable-p ido-current-directory)
-	       (yes-or-no-p (concat "Delete " file "? ")))
-      (delete-file file)
-      ;; Check if file still exists.
-      (if (file-exists-p file)
-	  ;; file could not be deleted
-	  (setq ido-rescan t)
-	;; else file was killed so remove name from list.
-	(setq ido-cur-list (delq (car ido-matches) ido-cur-list))))))
+  (if (not (eobp))
+      (kill-line)
+    (let ((enable-recursive-minibuffers t)
+	  (file (ido-name (car ido-matches))))
+      (if file
+	  (setq file (concat ido-current-directory file)))
+      (when (and file
+		 (file-exists-p file)
+		 (not (file-directory-p file))
+		 (file-writable-p ido-current-directory)
+		 (yes-or-no-p (concat "Delete " file "? ")))
+	(delete-file file)
+	;; Check if file still exists.
+	(if (file-exists-p file)
+	    ;; file could not be deleted
+	    (setq ido-rescan t)
+	  ;; else file was killed so remove name from list.
+	  (setq ido-cur-list (delq (car ido-matches) ido-cur-list)))))))
 
 
 ;;; VISIT CHOSEN BUFFER
@@ -4121,7 +4144,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
   (ido-trace "\n*merge timeout*" buffer)
   (setq ido-auto-merge-timer nil)
   (when (and (buffer-live-p buffer)
-	     (= ido-use-mycompletion-depth (minibuffer-depth))
+	     (ido-active)
 	     (boundp 'ido-eoinput) ido-eoinput)
     (let ((contents (buffer-substring-no-properties (minibuffer-prompt-end) ido-eoinput)))
       (ido-trace "request merge")
@@ -4141,7 +4164,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
   ;; 1. It prints a default file name when there is no text yet entered.
   ;; 2. It calls my completion routine rather than the standard completion.
 
-  (when (= ido-use-mycompletion-depth (minibuffer-depth))
+  (when (ido-active)
     (let ((contents (buffer-substring-no-properties (minibuffer-prompt-end) (point-max)))
 	  (buffer-undo-list t)
 	  try-single-dir-match
@@ -4444,16 +4467,17 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
 (defun ido-minibuffer-setup ()
   "Minibuffer setup hook for `ido'."
   ;; Copied from `icomplete-minibuffer-setup-hook'.
-  (when (and (boundp 'ido-completing-read)
-	     (or (featurep 'xemacs)
-		 (= ido-use-mycompletion-depth (minibuffer-depth))))
+  (when (ido-active)
     (add-hook 'pre-command-hook 'ido-tidy nil t)
     (add-hook 'post-command-hook 'ido-exhibit nil t)
     (setq cua-inhibit-cua-keys t)
     (when (featurep 'xemacs)
       (ido-exhibit)
       (goto-char (point-min)))
-    (run-hooks 'ido-minibuffer-setup-hook)))
+    (run-hooks 'ido-minibuffer-setup-hook)
+    (when ido-initial-position
+      (goto-char (+ (minibuffer-prompt-end) ido-initial-position))
+      (setq ido-initial-position nil))))
 
 (defun ido-tidy ()
   "Pre command hook for `ido'."
@@ -4465,8 +4489,7 @@ For details of keybindings, do `\\[describe-function] ido-find-file'."
     (cancel-timer ido-auto-merge-timer)
     (setq ido-auto-merge-timer nil))
 
-  (if (and (boundp 'ido-use-mycompletion-depth)
-	   (= ido-use-mycompletion-depth (minibuffer-depth)))
+  (if (ido-active)
       (if (and (boundp 'ido-eoinput)
 	       ido-eoinput)
 
diff --git a/lisp/ielm.el b/lisp/ielm.el
index 3e8921934ca..cceef70b37a 100644
--- a/lisp/ielm.el
+++ b/lisp/ielm.el
@@ -1,7 +1,7 @@
 ;;; ielm.el --- interaction mode for Emacs Lisp
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Smith <maa036@lancaster.ac.uk>
 ;; Maintainer: FSF
diff --git a/lisp/iimage.el b/lisp/iimage.el
index 99d7ea2ce34..76e01614f6e 100644
--- a/lisp/iimage.el
+++ b/lisp/iimage.el
@@ -1,6 +1,6 @@
 ;;; iimage.el --- Inline image minor mode.
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: KOSEKI Yoshinori <kose@meadowy.org>
 ;; Maintainer: KOSEKI Yoshinori <kose@meadowy.org>
diff --git a/lisp/image-file.el b/lisp/image-file.el
index d90f5efc8cd..5251a2c3ebe 100644
--- a/lisp/image-file.el
+++ b/lisp/image-file.el
@@ -1,7 +1,7 @@
 ;;; image-file.el --- support for visiting image files
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: multimedia
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 66f719ae1eb..5b24aa316dd 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -1,6 +1,6 @@
 ;;; image-mode.el --- support for visiting image files
 ;;
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Richard Stallman <rms@gnu.org>
 ;; Keywords: multimedia
diff --git a/lisp/image.el b/lisp/image.el
index a98ca87f728..22fa704d220 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1,7 +1,7 @@
 ;;; image.el --- image API
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: multimedia
@@ -36,7 +36,7 @@
 (defconst image-type-header-regexps
   '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
     ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
-    ("\\`GIF8" . gif)
+    ("\\`GIF8[79]a" . gif)
     ("\\`\x89PNG\r\n\x1a\n" . png)
     ("\\`[\t\n\r ]*#define \\([a-z0-9]+\\)_width [0-9]+\n\
 #define \\1_height [0-9]+\n\
diff --git a/lisp/imenu.el b/lisp/imenu.el
index fc2a27e3095..5644c517395 100644
--- a/lisp/imenu.el
+++ b/lisp/imenu.el
@@ -1,7 +1,7 @@
 ;;; imenu.el --- framework for mode-specific buffer indexes
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ake Stenhoff <etxaksf@aom.ericsson.se>
 ;;         Lars Lindberg <lli@sypro.cap.se>
diff --git a/lisp/indent.el b/lisp/indent.el
index 6f715fdba64..0b0588ab515 100644
--- a/lisp/indent.el
+++ b/lisp/indent.el
@@ -1,7 +1,7 @@
 ;;; indent.el --- indentation commands for Emacs
 
 ;; Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/info-look.el b/lisp/info-look.el
index 5097f2f5fdc..d7001cc0272 100644
--- a/lisp/info-look.el
+++ b/lisp/info-look.el
@@ -2,7 +2,7 @@
 ;; An older version of this was known as libc.el.
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ralph Schleicher <rs@nunatak.allgaeu.org>
 ;;         (did not show signs of life (Nov 2001)  -stef)
diff --git a/lisp/info-xref.el b/lisp/info-xref.el
index a6acfa8021c..61bfcc09260 100644
--- a/lisp/info-xref.el
+++ b/lisp/info-xref.el
@@ -1,6 +1,6 @@
 ;;; info-xref.el --- check external references in an Info document
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Ryde <user42@zip.com.au>
 ;; Keywords: docs
diff --git a/lisp/info.el b/lisp/info.el
index 880b659faa6..fb124d6ff54 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -1,7 +1,7 @@
 ;;; info.el --- info package for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
@@ -463,12 +463,12 @@ Do the right thing if the file has been compressed or zipped."
 		     (expand-file-name "info/" installation-directory)
 		   (if invocation-directory
 		       (let ((infodir (expand-file-name
-				       "../info/"
+				       "../share/info/"
 				       invocation-directory)))
 			 (if (file-exists-p infodir)
 			     infodir
 			   (setq infodir (expand-file-name
-					  "../../../info/"
+					  "../../../share/info/"
 					  invocation-directory))
 			   (and (file-exists-p infodir)
 				infodir))))))
diff --git a/lisp/informat.el b/lisp/informat.el
index f75460778c0..ea32343430e 100644
--- a/lisp/informat.el
+++ b/lisp/informat.el
@@ -1,7 +1,7 @@
 ;;; informat.el --- info support functions package for Emacs
 
 ;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
diff --git a/lisp/international/ccl.el b/lisp/international/ccl.el
index eab0d39f2fe..2a6939da5f5 100644
--- a/lisp/international/ccl.el
+++ b/lisp/international/ccl.el
@@ -1,9 +1,9 @@
 ;;; ccl.el --- CCL (Code Conversion Language) compiler
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 9f545b01231..acc1458ac9c 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -1,9 +1,9 @@
 ;;; characters.el --- set syntax and category for multibyte characters
 
-;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/code-pages.el b/lisp/international/code-pages.el
index 0baf2ff5099..5007a00b16d 100644
--- a/lisp/international/code-pages.el
+++ b/lisp/international/code-pages.el
@@ -1,8 +1,8 @@
 ;;; code-pages.el --- coding systems for assorted codepages  -*-coding: utf-8;-*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005, 2006
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/codepage.el b/lisp/international/codepage.el
index 9c045545ea6..ff30e4c14c4 100644
--- a/lisp/international/codepage.el
+++ b/lisp/international/codepage.el
@@ -1,7 +1,7 @@
 ;;; codepage.el --- MS-DOS/MS-Windows specific coding systems
 
 ;; Copyright (C) 1998, 1999, 2000, 2002  Free Software Foundation, Inc.
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index a39daff888a..22c43fb5017 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -1,9 +1,9 @@
 ;;; encoded-kb.el --- handler to input multibyte characters encoded somehow
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 5374842b649..81665ffd1ce 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -1,9 +1,9 @@
 ;;; fontset.el --- commands for handling fontset
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/isearch-x.el b/lisp/international/isearch-x.el
index a002df6687b..76a33d2569e 100644
--- a/lisp/international/isearch-x.el
+++ b/lisp/international/isearch-x.el
@@ -1,9 +1,9 @@
 ;;; isearch-x.el --- extended isearch handling commands
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/iso-ascii.el b/lisp/international/iso-ascii.el
index 1e0e129c3d9..37e6f292353 100644
--- a/lisp/international/iso-ascii.el
+++ b/lisp/international/iso-ascii.el
@@ -1,7 +1,7 @@
 ;;; iso-ascii.el --- set up char tables for ISO 8859/1 on ASCII terminals
 
 ;; Copyright (C) 1987, 1995, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/international/iso-cvt.el b/lisp/international/iso-cvt.el
index 00631390579..eb94794145f 100644
--- a/lisp/international/iso-cvt.el
+++ b/lisp/international/iso-cvt.el
@@ -2,7 +2,7 @@
 ;; This file was formerly called gm-lingo.el.
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind <mike@vlsivie.tuwien.ac.at>
 ;; Keywords: tex, iso, latin, i18n
diff --git a/lisp/international/iso-transl.el b/lisp/international/iso-transl.el
index f39601f1f5a..16beb450a31 100644
--- a/lisp/international/iso-transl.el
+++ b/lisp/international/iso-transl.el
@@ -1,7 +1,7 @@
 ;;; iso-transl.el --- keyboard input definitions for ISO 8859-1  -*- coding: iso-8859-1 -*-
 
 ;; Copyright (C) 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001
-;;   2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/international/ja-dic-cnv.el b/lisp/international/ja-dic-cnv.el
index ee0bf67a537..babfc5bacf7 100644
--- a/lisp/international/ja-dic-cnv.el
+++ b/lisp/international/ja-dic-cnv.el
@@ -1,7 +1,7 @@
 ;;; ja-dic-cnv.el --- convert a Japanese dictionary (SKK-JISYO.L) to Emacs Lisp
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
@@ -365,7 +365,7 @@ The name of generated file is specified by the variable `ja-dic-filename'."
 	      ";;\tGenerated by the command `skkdic-convert'\n"
 	      ";;\tDate: " (current-time-string) "\n"
 	      ";;\tOriginal SKK dictionary file: "
-	      (file-name-nondirectory filename)
+	      (file-relative-name (expand-file-name filename) dirname)
 	      "\n\n"
 	      ";; This file is part of GNU Emacs.\n\n"
 	      ";;; Commentary:\n\n"
diff --git a/lisp/international/ja-dic-utl.el b/lisp/international/ja-dic-utl.el
index 31b92885e7b..3b16c14dc4e 100644
--- a/lisp/international/ja-dic-utl.el
+++ b/lisp/international/ja-dic-utl.el
@@ -1,7 +1,7 @@
 ;;; ja-dic-utl.el --- utilities for handling Japanese dictionary (SKK-JISYO.L)
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/kinsoku.el b/lisp/international/kinsoku.el
index a452f53c5dc..2b5ba1de650 100644
--- a/lisp/international/kinsoku.el
+++ b/lisp/international/kinsoku.el
@@ -1,9 +1,9 @@
 ;;; kinsoku.el --- `Kinsoku' processing funcs -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/kkc.el b/lisp/international/kkc.el
index 4094538c9a0..d671d2900c2 100644
--- a/lisp/international/kkc.el
+++ b/lisp/international/kkc.el
@@ -1,9 +1,9 @@
 ;;; kkc.el --- Kana Kanji converter    -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/latexenc.el b/lisp/international/latexenc.el
index 4f9b4f740d5..e19cff0eace 100644
--- a/lisp/international/latexenc.el
+++ b/lisp/international/latexenc.el
@@ -1,6 +1,6 @@
 ;;; latexenc.el --- guess correct coding system in LaTeX files -*-coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Arne J,Ax(Brgensen <arne@arnested.dk>
 ;; Keywords: mule, coding system, latex
diff --git a/lisp/international/latin-1.el b/lisp/international/latin-1.el
index d5dad7fe83a..4c312565550 100644
--- a/lisp/international/latin-1.el
+++ b/lisp/international/latin-1.el
@@ -1,6 +1,6 @@
 ;;; latin-1.el --- set up case-conversion and syntax tables for ISO Latin-1
 
-;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
diff --git a/lisp/international/latin-2.el b/lisp/international/latin-2.el
index ca831d02d75..755d845532a 100644
--- a/lisp/international/latin-2.el
+++ b/lisp/international/latin-2.el
@@ -1,7 +1,7 @@
 ;;; latin-2.el --- set up case-conversion and syntax tables for ISO Latin-2
 
 ;; Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Michael Gschwind (mike@vlsivie.tuwien.ac.at)
 ;; Maintainer: FSF
diff --git a/lisp/international/latin-3.el b/lisp/international/latin-3.el
index 6f32d6ec628..18f5b071077 100644
--- a/lisp/international/latin-3.el
+++ b/lisp/international/latin-3.el
@@ -1,7 +1,7 @@
 ;;; latin-3.el --- set up case-conversion and syntax tables for ISO Latin-3
 
 ;; Copyright (C) 1988, 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Marko Rahamaa
 ;; Maintainer: FSF
diff --git a/lisp/international/latin-4.el b/lisp/international/latin-4.el
index 5eb46259e29..5fd3767742e 100644
--- a/lisp/international/latin-4.el
+++ b/lisp/international/latin-4.el
@@ -1,7 +1,7 @@
 ;;; latin-4.el --- set up case-conversion and syntax tables for ISO Latin-4
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum
 ;; Maintainer: FSF
diff --git a/lisp/international/latin-5.el b/lisp/international/latin-5.el
index f51f562a7ef..a36eb89798b 100644
--- a/lisp/international/latin-5.el
+++ b/lisp/international/latin-5.el
@@ -1,7 +1,7 @@
 ;;; latin-5.el --- set up case-conversion and syntax tables for ISO latin-5
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum
 ;; Maintainer: FSF
diff --git a/lisp/international/latin-8.el b/lisp/international/latin-8.el
index 31bb8ad57eb..710784b40fd 100644
--- a/lisp/international/latin-8.el
+++ b/lisp/international/latin-8.el
@@ -1,7 +1,7 @@
 ;;; latin-8.el --- set up case-conversion and syntax tables for ISO Latin-8
 
 ;; Copyright (C) 1988, 1997, 1999, 2001, 2002, 2003, 2004, 2005
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love
 ;; Maintainer: FSF
diff --git a/lisp/international/latin-9.el b/lisp/international/latin-9.el
index 5bb65deab91..c29925f8dc2 100644
--- a/lisp/international/latin-9.el
+++ b/lisp/international/latin-9.el
@@ -1,7 +1,7 @@
 ;;; latin-9.el --- set up case-conversion and syntax tables for ISO Latin-9
 
 ;; Copyright (C) 1988, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love
 ;; Maintainer: FSF
diff --git a/lisp/international/latin1-disp.el b/lisp/international/latin1-disp.el
index 60edc2a826d..6b2b6c50760 100644
--- a/lisp/international/latin1-disp.el
+++ b/lisp/international/latin1-disp.el
@@ -1,6 +1,6 @@
 ;;; latin1-disp.el --- display tables for other ISO 8859 on Latin-1 terminals -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 41f6b376995..5d71935c0d1 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1,9 +1,9 @@
 ;;; mule-cmds.el --- commands for mulitilingual environment -*-coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 2f88b08254f..05f259b038f 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1,8 +1,8 @@
 ;;; mule-conf.el --- configure multilingual environment -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/mule-diag.el b/lisp/international/mule-diag.el
index 95569a78240..80bfd2dbfa3 100644
--- a/lisp/international/mule-diag.el
+++ b/lisp/international/mule-diag.el
@@ -1,9 +1,9 @@
 ;;; mule-diag.el --- show diagnosis of multilingual environment (Mule)
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/mule-util.el b/lisp/international/mule-util.el
index d8b7aa903be..78ef30a56de 100644
--- a/lisp/international/mule-util.el
+++ b/lisp/international/mule-util.el
@@ -1,9 +1,9 @@
 ;;; mule-util.el --- utility functions for mulitilingual environment (mule)
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 0a2c7cbe9ad..5df2d483875 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1,9 +1,9 @@
 ;;; mule.el --- basic commands for mulitilingual environment
 
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/ogonek.el b/lisp/international/ogonek.el
index e629a4554e1..06bebb1f0da 100644
--- a/lisp/international/ogonek.el
+++ b/lisp/international/ogonek.el
@@ -1,6 +1,6 @@
 ;;; ogonek.el --- change the encoding of Polish diacritics
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: W{\l}odek Bzyl, Ryszard Kubiak
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index a3871224127..3244a6a1c0b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -1,9 +1,9 @@
 ;;; quail.el --- provides simple input method for multilingual text
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/subst-big5.el b/lisp/international/subst-big5.el
index e9123bbc653..e53826f2ee5 100644
--- a/lisp/international/subst-big5.el
+++ b/lisp/international/subst-big5.el
@@ -1,6 +1,6 @@
 ;;; subst-big5.el --- Unicode/GB2312 translation     -*-coding: big5;-*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/international/subst-gb2312.el b/lisp/international/subst-gb2312.el
index 6ee5cc3b458..83ba31a2601 100644
--- a/lisp/international/subst-gb2312.el
+++ b/lisp/international/subst-gb2312.el
@@ -1,6 +1,6 @@
 ;;; subst-gb2312.el --- Unicode/GB2312 translation     -*-coding: euc-china;-*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/international/subst-jis.el b/lisp/international/subst-jis.el
index 1462c567b9c..b5100c683ed 100644
--- a/lisp/international/subst-jis.el
+++ b/lisp/international/subst-jis.el
@@ -1,7 +1,7 @@
 ;;; subst-jis.el --- Unicode/JISX translation    -*-coding: euc-jp;-*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2004, 2005, 2006
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/subst-ksc.el b/lisp/international/subst-ksc.el
index a804be24bf5..7ac82de9daf 100644
--- a/lisp/international/subst-ksc.el
+++ b/lisp/international/subst-ksc.el
@@ -1,6 +1,6 @@
 ;;; subst-ksc.el --- Unicode/KSC-5601 translation    -*-coding: euc-kr;-*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n
diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el
index 68e4f6596f7..9577ccf50ad 100644
--- a/lisp/international/titdic-cnv.el
+++ b/lisp/international/titdic-cnv.el
@@ -1,9 +1,9 @@
 ;;; titdic-cnv.el --- convert cxterm dictionary (TIT format) to Quail package -*- coding:iso-2022-7bit; -*-
 
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/ucs-tables.el b/lisp/international/ucs-tables.el
index 0f413cd9fd3..222209582bd 100644
--- a/lisp/international/ucs-tables.el
+++ b/lisp/international/ucs-tables.el
@@ -1,7 +1,7 @@
 ;;; ucs-tables.el --- translation to, from and via Unicode  -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2005, 2006, 2007  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/utf-16.el b/lisp/international/utf-16.el
index 712566bd736..9c99077cbcc 100644
--- a/lisp/international/utf-16.el
+++ b/lisp/international/utf-16.el
@@ -1,8 +1,8 @@
 ;;; utf-16.el --- UTF-16 encoding/decoding
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 662b5306a75..eb413b29f7b 100644
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -1,6 +1,6 @@
 ;;; utf-7.el --- utf-7 coding system
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: i18n, mail
diff --git a/lisp/international/utf-8.el b/lisp/international/utf-8.el
index 53c65fa5fc4..2e4a2f6f49a 100644
--- a/lisp/international/utf-8.el
+++ b/lisp/international/utf-8.el
@@ -1,8 +1,8 @@
 ;;; utf-8.el --- UTF-8 decoding/encoding support -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 6ef83c68fd8..121ccefacd1 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1,7 +1,7 @@
 ;;; isearch.el --- incremental search minor mode
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@cs.uiuc.edu>
 ;; Maintainer: FSF
@@ -2235,7 +2235,18 @@ since they have special meaning in a regexp."
 	      (setq found t))
 	  (setq quote-flag nil)))
       (setq i (1+ i)))
-    (not found)))
+    (not (or found
+             ;; Even if there's no uppercase char, we want to detect the use
+             ;; of [:upper:] or [:lower:] char-class, which indicates
+             ;; clearly that the user cares about case distinction.
+             (and regexp-flag (string-match "\\[:\\(upp\\|low\\)er:]" string)
+                  (condition-case err
+                      (progn
+                        (string-match (substring string 0 (match-beginning 0))
+                                      "")
+                        nil)
+                    (invalid-regexp
+                     (equal "Unmatched [ or [^" (cadr err)))))))))
 
 ;; Portability functions to support various Emacs versions.
 
diff --git a/lisp/isearchb.el b/lisp/isearchb.el
index 5fd59a2e5ee..0f46969a2d2 100644
--- a/lisp/isearchb.el
+++ b/lisp/isearchb.el
@@ -1,6 +1,6 @@
 ;;; isearchb --- a marriage between iswitchb and isearch
 
-;; Copyright (C) 2004, 2005, 2006 John Wiegley
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/jit-lock.el b/lisp/jit-lock.el
index e049579d463..958bb679832 100644
--- a/lisp/jit-lock.el
+++ b/lisp/jit-lock.el
@@ -1,7 +1,7 @@
 ;;; jit-lock.el --- just-in-time fontification
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@gnu.org>
 ;; Keywords: faces files
diff --git a/lisp/jka-cmpr-hook.el b/lisp/jka-cmpr-hook.el
index 12941e962a0..ce00181aaa3 100644
--- a/lisp/jka-cmpr-hook.el
+++ b/lisp/jka-cmpr-hook.el
@@ -1,7 +1,7 @@
 ;;; jka-cmpr-hook.el --- preloaded code to enable jka-compr.el
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
@@ -248,10 +248,6 @@ APPEND-FLAG STRIP-EXTENSION-FLAG FILE-MAGIC-CHARS], where:
    file-magic-chars      is a string of characters that you would find
 			 at the beginning of a file compressed in this way.
 
-Because of the way `call-process' is defined, discarding the stderr output of
-a program adds the overhead of starting a shell each time the program is
-invoked.
-
 If you set this outside Custom while Auto Compression mode is
 already enabled \(as it is by default), you have to call
 `jka-compr-update' after setting it to properly update other
diff --git a/lisp/jka-compr.el b/lisp/jka-compr.el
index 07f5d068b4e..8c107cc3271 100644
--- a/lisp/jka-compr.el
+++ b/lisp/jka-compr.el
@@ -1,7 +1,7 @@
 ;;; jka-compr.el --- reading/writing/loading compressed files
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: jka@ece.cmu.edu (Jay K. Adams)
 ;; Maintainer: FSF
@@ -47,18 +47,9 @@
 ;; The default value of this variable allows jka-compr to work with
 ;; Unix compress and gzip.
 ;;
-;; If you are concerned about the stderr output of gzip and other
-;; compression/decompression programs showing up in your buffers, you
-;; should set the discard-error flag in the compression-info-list.
-;; This will cause the stderr of all programs to be discarded.
-;; However, it also causes emacs to call compression/uncompression
-;; programs through a shell (which is specified by jka-compr-shell).
-;; This may be a drag if, on your system, starting up a shell is
-;; slow.
-;;
 ;; If you don't want messages about compressing and decompressing
-;; to show up in the echo area, you can set the compress-name and
-;; decompress-name fields of the jka-compr-compression-info-list to
+;; to show up in the echo area, you can set the compress-msg and
+;; decompress-msg fields of the jka-compr-compression-info-list to
 ;; nil.
 
 
@@ -105,9 +96,7 @@
 
 (defcustom jka-compr-shell "sh"
   "*Shell to be used for calling compression programs.
-The value of this variable only matters if you want to discard the
-stderr of a compression/decompression program (see the documentation
-for `jka-compr-compression-info-list')."
+NOTE: Not used in MS-DOS and Windows systems."
   :type 'string
   :group 'jka-compr)
 
diff --git a/lisp/kermit.el b/lisp/kermit.el
index 2b5f030b3b7..5d892999781 100644
--- a/lisp/kermit.el
+++ b/lisp/kermit.el
@@ -1,7 +1,7 @@
 ;;; kermit.el --- additions to shell mode for use with kermit
 
 ;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeff Norden <jeff@colgate.csnet>
 ;; Maintainer: FSF
diff --git a/lisp/kmacro.el b/lisp/kmacro.el
index 19e8735de48..bfc0edba2c1 100644
--- a/lisp/kmacro.el
+++ b/lisp/kmacro.el
@@ -1,6 +1,7 @@
 ;;; kmacro.el --- enhanced keyboard macros
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006,
+;;   2007 Free Software Foundation, Inc.
 
 ;; Author: Kim F. Storm <storm@cua.dk>
 ;; Keywords: keyboard convenience
@@ -255,7 +256,7 @@ macro to be executed before appending to it."
 
 (defun kmacro-insert-counter (arg)
   "Insert macro counter and increment with ARG or 1 if missing.
-With \\[universal-argument], insert previous kmacro-counter (but do not modify counter)."
+With \\[universal-argument], insert previous `kmacro-counter' (but do not modify counter)."
   (interactive "P")
   (if kmacro-initial-counter-value
       (setq kmacro-counter kmacro-initial-counter-value
@@ -283,7 +284,7 @@ With \\[universal-argument], insert previous kmacro-counter (but do not modify c
 
 
 (defun kmacro-set-counter (arg)
-  "Set kmacro-counter to ARG or prompt if missing.
+  "Set `kmacro-counter' to ARG or prompt if missing.
 With \\[universal-argument] prefix, reset counter to its value prior to this iteration of the macro."
   (interactive "NMacro counter value: ")
   (if (not (or defining-kbd-macro executing-kbd-macro))
@@ -453,14 +454,14 @@ Optional arg EMPTY is message to print if no macros are defined."
 
 
 (defun kmacro-call-ring-2nd (arg)
-  "Execute second keyboard macro at in macro ring."
+  "Execute second keyboard macro in macro ring."
   (interactive "P")
   (unless (kmacro-ring-empty-p)
     (kmacro-exec-ring-item (car kmacro-ring) arg)))
 
 
 (defun kmacro-call-ring-2nd-repeat (arg)
-  "Execute second keyboard macro at in macro ring.
+  "Execute second keyboard macro in macro ring.
 This is like `kmacro-call-ring-2nd', but allows repeating macro commands
 without repeating the prefix."
   (interactive "P")
@@ -670,7 +671,7 @@ the current value of `kmacro-counter').
 
 When defining/executing macro, inserts macro counter and increments
 the counter with ARG or 1 if missing.  With \\[universal-argument],
-inserts previous kmacro-counter (but do not modify counter).
+inserts previous `kmacro-counter' (but do not modify counter).
 
 The macro counter can be modified via \\[kmacro-set-counter] and \\[kmacro-add-counter].
 The format of the counter can be modified via \\[kmacro-set-format]."
@@ -941,7 +942,7 @@ following additional answers: `insert', `insert-1', `replace', `replace-1',
 (defvar kmacro-step-edit-prefix-commands
   '(universal-argument universal-argument-more universal-argument-minus
 		       digit-argument negative-argument)
-  "Commands which builds up a prefix arg for the current command")
+  "Commands which build up a prefix arg for the current command.")
 
 (defun kmacro-step-edit-prompt (macro index)
   ;; Show step-edit prompt
diff --git a/lisp/language/china-util.el b/lisp/language/china-util.el
index bafdce1c854..49041e611ac 100644
--- a/lisp/language/china-util.el
+++ b/lisp/language/china-util.el
@@ -1,9 +1,9 @@
 ;;; china-util.el --- utilities for Chinese  -*- coding: iso-2022-7bit -*-
 
-;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/chinese.el b/lisp/language/chinese.el
index ee1709fcc18..9d2297cb7a7 100644
--- a/lisp/language/chinese.el
+++ b/lisp/language/chinese.el
@@ -1,9 +1,9 @@
 ;;; chinese.el --- support for Chinese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/cyril-util.el b/lisp/language/cyril-util.el
index 321414242f8..3395ce4d1ac 100644
--- a/lisp/language/cyril-util.el
+++ b/lisp/language/cyril-util.el
@@ -1,7 +1,7 @@
 ;;; cyril-util.el --- utilities for Cyrillic scripts
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, Cyrillic
 
diff --git a/lisp/language/cyrillic.el b/lisp/language/cyrillic.el
index 4e709cc5b63..656f6b60096 100644
--- a/lisp/language/cyrillic.el
+++ b/lisp/language/cyrillic.el
@@ -1,9 +1,9 @@
 ;;; cyrillic.el --- support for Cyrillic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/czech.el b/lisp/language/czech.el
index 4eee8fd54b3..43dff0d57ba 100644
--- a/lisp/language/czech.el
+++ b/lisp/language/czech.el
@@ -1,6 +1,6 @@
 ;;; czech.el --- support for Czech -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
diff --git a/lisp/language/devan-util.el b/lisp/language/devan-util.el
index 354d0c19a29..b25e90cebe9 100644
--- a/lisp/language/devan-util.el
+++ b/lisp/language/devan-util.el
@@ -1,8 +1,8 @@
 ;;; devan-util.el --- Support for composing Devanagari characters
 
-;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/devanagari.el b/lisp/language/devanagari.el
index 1b6d9100b5b..c337ecb2a4f 100644
--- a/lisp/language/devanagari.el
+++ b/lisp/language/devanagari.el
@@ -1,6 +1,6 @@
 ;;; devanagari.el --- Support for Devanagari -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
diff --git a/lisp/language/english.el b/lisp/language/english.el
index f3719fd9bbc..d12ed650186 100644
--- a/lisp/language/english.el
+++ b/lisp/language/english.el
@@ -1,8 +1,8 @@
 ;;; english.el --- support for English -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/ethio-util.el b/lisp/language/ethio-util.el
index b22fad32854..857df138670 100644
--- a/lisp/language/ethio-util.el
+++ b/lisp/language/ethio-util.el
@@ -1,8 +1,8 @@
 ;;; ethio-util.el --- utilities for Ethiopic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/ethiopic.el b/lisp/language/ethiopic.el
index 29679a8ca73..1ae1f461f2d 100644
--- a/lisp/language/ethiopic.el
+++ b/lisp/language/ethiopic.el
@@ -1,9 +1,9 @@
 ;;; ethiopic.el --- support for Ethiopic -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/european.el b/lisp/language/european.el
index 60401e56ab1..ccbbf8318c9 100644
--- a/lisp/language/european.el
+++ b/lisp/language/european.el
@@ -1,9 +1,9 @@
 ;;; european.el --- support for European languages -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/georgian.el b/lisp/language/georgian.el
index b2624b9555f..21b61b2667c 100644
--- a/lisp/language/georgian.el
+++ b/lisp/language/georgian.el
@@ -1,6 +1,6 @@
 ;;; georgian.el --- language support for Georgian -*- no-byte-compile: t -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
diff --git a/lisp/language/greek.el b/lisp/language/greek.el
index 9eb7b4f7352..c391319b885 100644
--- a/lisp/language/greek.el
+++ b/lisp/language/greek.el
@@ -1,7 +1,7 @@
 ;;; greek.el --- support for Greek -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index abd2f6612bf..715b06190b4 100644
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -1,9 +1,9 @@
 ;;; hebrew.el --- support for Hebrew -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/ind-util.el b/lisp/language/ind-util.el
index 1a082ba04e9..521fc252372 100644
--- a/lisp/language/ind-util.el
+++ b/lisp/language/ind-util.el
@@ -1,6 +1,6 @@
 ;;; ind-util.el --- Transliteration and Misc. Tools for Indian Languages -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
diff --git a/lisp/language/indian.el b/lisp/language/indian.el
index 5d58271463b..0fed075f553 100644
--- a/lisp/language/indian.el
+++ b/lisp/language/indian.el
@@ -1,8 +1,8 @@
 ;;; indian.el --- Indian languages support -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/japan-util.el b/lisp/language/japan-util.el
index c37e0bafd0a..ba190ba171d 100644
--- a/lisp/language/japan-util.el
+++ b/lisp/language/japan-util.el
@@ -1,9 +1,9 @@
 ;;; japan-util.el --- utilities for Japanese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/japanese.el b/lisp/language/japanese.el
index 12a09423a32..b9b0eeb2a14 100644
--- a/lisp/language/japanese.el
+++ b/lisp/language/japanese.el
@@ -1,9 +1,9 @@
 ;;; japanese.el --- support for Japanese -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/kannada.el b/lisp/language/kannada.el
index 77d793839da..309f2785f5f 100644
--- a/lisp/language/kannada.el
+++ b/lisp/language/kannada.el
@@ -1,6 +1,6 @@
 ;;; kannada.el --- Support for Kannada -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer:  CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org>
 ;; Keywords: multilingual, Indian, Kannada
diff --git a/lisp/language/knd-util.el b/lisp/language/knd-util.el
index dbdab4ead36..dd8a722c706 100644
--- a/lisp/language/knd-util.el
+++ b/lisp/language/knd-util.el
@@ -1,6 +1,6 @@
 ;;; knd-util.el --- Support for composing Kannada characters
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer:  Maintainer:  CHOWKSEY, Kailash C. <klchxbec@m-net.arbornet.org>
 ;; Keywords: multilingual, Kannada
diff --git a/lisp/language/korea-util.el b/lisp/language/korea-util.el
index f4d8e179eb2..3a9778bf22b 100644
--- a/lisp/language/korea-util.el
+++ b/lisp/language/korea-util.el
@@ -1,8 +1,8 @@
 ;;; korea-util.el --- utilities for Korean
 
-;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/korean.el b/lisp/language/korean.el
index 3e04c13b7d0..3cf291eb589 100644
--- a/lisp/language/korean.el
+++ b/lisp/language/korean.el
@@ -1,9 +1,9 @@
 ;;; korean.el --- support for Korean -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/lao-util.el b/lisp/language/lao-util.el
index 60f15670525..cbb2f09a35b 100644
--- a/lisp/language/lao-util.el
+++ b/lisp/language/lao-util.el
@@ -1,8 +1,8 @@
 ;;; lao-util.el --- utilities for Lao -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/lao.el b/lisp/language/lao.el
index b55c731801d..e4158f682ad 100644
--- a/lisp/language/lao.el
+++ b/lisp/language/lao.el
@@ -1,7 +1,7 @@
 ;;; lao.el --- support for Lao -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
 ;; Copyright (C) 2001  Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/malayalam.el b/lisp/language/malayalam.el
index ea264a87e64..bc2a9614714 100644
--- a/lisp/language/malayalam.el
+++ b/lisp/language/malayalam.el
@@ -1,6 +1,6 @@
 ;;; malayalam.el --- Support for Malayalam -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Malayalam
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index d7bc6f1b18b..1d90e2d9a0c 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -1,7 +1,7 @@
 ;;; misc-lang.el --- support for miscellaneous languages (characters) -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/mlm-util.el b/lisp/language/mlm-util.el
index e20d64cd293..aac0951eaec 100644
--- a/lisp/language/mlm-util.el
+++ b/lisp/language/mlm-util.el
@@ -1,6 +1,6 @@
 ;;; mlm-util.el --- support for composing malayalam characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer:  KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Malayalam
diff --git a/lisp/language/romanian.el b/lisp/language/romanian.el
index 50f0f4e7e82..9776fe23464 100644
--- a/lisp/language/romanian.el
+++ b/lisp/language/romanian.el
@@ -1,6 +1,6 @@
 ;;; romanian.el --- support for Romanian -*- coding: iso-latin-2; no-byte-compile: t -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation.
 
 ;; Author:    Dan Nicolaescu <done@ece.arizona.edu>
diff --git a/lisp/language/slovak.el b/lisp/language/slovak.el
index 27982c3ee16..06d10731e85 100644
--- a/lisp/language/slovak.el
+++ b/lisp/language/slovak.el
@@ -1,6 +1,6 @@
 ;;; slovak.el --- support for Slovak -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation.
 
 ;; Authors:    Tibor ,B)(Bimko <tibor.simko@fmph.uniba.sk>,
diff --git a/lisp/language/tamil.el b/lisp/language/tamil.el
index c1456f2a556..e4a495ca635 100644
--- a/lisp/language/tamil.el
+++ b/lisp/language/tamil.el
@@ -1,6 +1,6 @@
 ;;; tamil.el --- Support for Tamil -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer: KAWABATA, Taichi <batta@beige.ocn.ne.jp>
 ;; Keywords: multilingual, Indian, Tamil
diff --git a/lisp/language/thai-util.el b/lisp/language/thai-util.el
index d91cc56116e..3ce0ef696d2 100644
--- a/lisp/language/thai-util.el
+++ b/lisp/language/thai-util.el
@@ -1,10 +1,10 @@
 ;;; thai-util.el --- utilities for Thai -*- coding: iso-2022-7bit; -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Keywords: mule, multilingual, thai
diff --git a/lisp/language/thai-word.el b/lisp/language/thai-word.el
index b6144a1fb47..3162b504a23 100644
--- a/lisp/language/thai-word.el
+++ b/lisp/language/thai-word.el
@@ -1,6 +1,6 @@
 ;;; thai-word.el -- find Thai word boundaries
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/thai.el b/lisp/language/thai.el
index 65d5f7d1748..67d8734c482 100644
--- a/lisp/language/thai.el
+++ b/lisp/language/thai.el
@@ -1,11 +1,11 @@
 ;;; thai.el --- support for Thai -*- coding: iso-2022-7bit; no-byte-compile: t -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 ;; Copyright (C) 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Keywords: multilingual, Thai
 
diff --git a/lisp/language/tibet-util.el b/lisp/language/tibet-util.el
index d2d1950dad9..d79a20a024e 100644
--- a/lisp/language/tibet-util.el
+++ b/lisp/language/tibet-util.el
@@ -1,9 +1,9 @@
 ;;; tibet-util.el --- utilities for Tibetan   -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/tibetan.el b/lisp/language/tibetan.el
index f4ebb391610..94dc50bc15d 100644
--- a/lisp/language/tibetan.el
+++ b/lisp/language/tibetan.el
@@ -1,8 +1,8 @@
 ;;; tibetan.el --- support for Tibetan language -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/tml-util.el b/lisp/language/tml-util.el
index 0e6e95e59d1..31e2e97d434 100644
--- a/lisp/language/tml-util.el
+++ b/lisp/language/tml-util.el
@@ -1,6 +1,6 @@
 ;;; tml-util.el --- support for composing tamil characters  -*-coding: iso-2022-7bit;-*-
 
-;; Copyright (C) 2001, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer: KAWABATA, Taichi <kawabata@m17n.org>
 ;; Keywords: multilingual, Indian, Tamil
diff --git a/lisp/language/utf-8-lang.el b/lisp/language/utf-8-lang.el
index 894c0484c48..2bd3419ecc8 100644
--- a/lisp/language/utf-8-lang.el
+++ b/lisp/language/utf-8-lang.el
@@ -1,6 +1,6 @@
 ;;; utf-8-lang.el --- generic UTF-8 language environment -*- no-byte-compile: t -*-
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
diff --git a/lisp/language/viet-util.el b/lisp/language/viet-util.el
index 0c4890cb9e4..2a1cc0fd679 100644
--- a/lisp/language/viet-util.el
+++ b/lisp/language/viet-util.el
@@ -1,9 +1,9 @@
 ;;; viet-util.el --- utilities for Vietnamese  -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/language/vietnamese.el b/lisp/language/vietnamese.el
index 870dd474451..191637fb1a4 100644
--- a/lisp/language/vietnamese.el
+++ b/lisp/language/vietnamese.el
@@ -1,9 +1,9 @@
 ;;; vietnamese.el --- support for Vietnamese -*- coding: iso-2022-7bit; -*-
 
-;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006
+;;   2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el
index 80e2f978f58..82b8aeea059 100644
--- a/lisp/ldefs-boot.el
+++ b/lisp/ldefs-boot.el
@@ -4684,12 +4684,12 @@ Compile the program including the current buffer.  Default: run `make'.
 Runs COMMAND, a shell command, in a separate process asynchronously
 with output going to the buffer `*compilation*'.
 
-If optional second arg COMINT is t the buffer will be in Comint mode with
-`compilation-shell-minor-mode'.
-
 You can then use the command \\[next-error] to find the next error message
 and move to the source code that caused it.
 
+If optional second arg COMINT is t the buffer will be in Comint mode with
+`compilation-shell-minor-mode'.
+
 Interactively, prompts for the command if `compilation-read-command' is
 non-nil; otherwise uses `compile-command'.  With prefix arg, always prompts.
 Additionally, with universal prefix arg, compilation buffer will be in
@@ -8638,10 +8638,7 @@ If WIND-B is nil, use window next to WIND-A.
 
 (autoload (quote ediff-regions-wordwise) "ediff" "\
 Run Ediff on a pair of regions in specified buffers.
-Regions (i.e., point and mark) are assumed to be set in advance except
-for the second region in the case both regions are from the same buffer.
-In such a case the user is asked to interactively establish the second
-region.
+Regions (i.e., point and mark) can be set in advance or marked interactively.
 This function is effective only for relatively small regions, up to 200
 lines.  For large regions, use `ediff-regions-linewise'.
 
@@ -8649,10 +8646,7 @@ lines.  For large regions, use `ediff-regions-linewise'.
 
 (autoload (quote ediff-regions-linewise) "ediff" "\
 Run Ediff on a pair of regions in specified buffers.
-Regions (i.e., point and mark) are assumed to be set in advance except
-for the second region in the case both regions are from the same buffer.
-In such a case the user is asked to interactively establish the second
-region.
+Regions (i.e., point and mark) can be set in advance or marked interactively.
 Each region is enlarged to contain full lines.
 This function is effective for large regions, over 100-200
 lines.  For small regions, use `ediff-regions-wordwise'.
@@ -15931,11 +15925,11 @@ re-start Emacs.")
 
 (setq ispell-dictionary-alist-2 (quote (("czech" "[A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "[^A-Za-z\301\311\314\315\323\332\331\335\256\251\310\330\317\253\322\341\351\354\355\363\372\371\375\276\271\350\370\357\273\362]" "" nil ("-B") nil iso-8859-2) ("dansk" "[A-Z\306\330\305a-z\346\370\345]" "[^A-Z\306\330\305a-z\346\370\345]" "[']" nil ("-C") nil iso-8859-1) ("deutsch" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("deutsch8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "deutsch") "~latin1" iso-8859-1) ("english" "[A-Za-z]" "[^A-Za-z]" "[']" nil ("-B") nil iso-8859-1))))
 
-(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-3) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1))))
+(setq ispell-dictionary-alist-3 (quote (("esperanto" "[A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[^A-Za-z\246\254\266\274\306\330\335\336\346\370\375\376]" "[-']" t ("-C") "~latin3" iso-8859-3) ("esperanto-tex" "[A-Za-z^\\]" "[^A-Za-z^\\]" "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3) ("francais7" "[A-Za-z]" "[^A-Za-z]" "[`'^-]" t nil nil iso-8859-1) ("francais" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]" "[-'.@]" t nil "~list" iso-8859-1) ("francais-tex" "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374\\]" "[-'^`\".@]" t nil "~tex" iso-8859-1))))
 
 (setq ispell-dictionary-alist-4 (quote (("german" "[a-zA-Z\"]" "[^a-zA-Z\"]" "[']" t ("-C") "~tex" iso-8859-1) ("german8" "[a-zA-Z\304\326\334\344\366\337\374]" "[^a-zA-Z\304\326\334\344\366\337\374]" "[']" t ("-C" "-d" "german") "~latin1" iso-8859-1) ("italiano" "[A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[^A-Z\300\301\310\311\314\315\322\323\331\332a-z\340\341\350\351\354\355\363\371\372]" "[-.]" nil ("-B" "-d" "italian") "~tex" iso-8859-1) ("nederlands" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1) ("nederlands8" "[A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[^A-Za-z\300\301\302\303\304\305\307\310\311\312\313\314\315\316\317\322\323\324\325\326\331\332\333\334\340\341\342\343\344\345\347\350\351\352\353\354\355\356\357\361\362\363\364\365\366\371\372\373\374]" "[']" t ("-C") nil iso-8859-1))))
 
-(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "." nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1))))
+(setq ispell-dictionary-alist-5 (quote (("norsk" "[A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[^A-Za-z\305\306\307\310\311\322\324\330\345\346\347\350\351\362\364\370]" "[\"]" nil nil "~list" iso-8859-1) ("norsk7-tex" "[A-Za-z{}\\'^`]" "[^A-Za-z{}\\'^`]" "[\"]" nil ("-d" "norsk") "~plaintex" iso-8859-1) ("polish" "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]" "[.]" nil nil nil iso-8859-2) ("portugues" "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]" "[']" t ("-C") "~latin1" iso-8859-1))))
 
 (setq ispell-dictionary-alist-6 (quote (("russian" "[\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "[^\341\342\367\347\344\345\263\366\372\351\352\353\354\355\356\357\360\362\363\364\365\346\350\343\376\373\375\370\371\377\374\340\361\301\302\327\307\304\305\243\326\332\311\312\313\314\315\316\317\320\322\323\324\325\306\310\303\336\333\335\330\331\337\334\300\321]" "" nil nil nil koi8-r) ("russianw" "[\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "[^\300\301\302\303\304\305\250\306\307\310\311\312\313\314\315\316\317\320\321\322\323\324\325\326\327\330\331\334\333\332\335\336\337\340\341\342\343\344\345\270\346\347\350\351\352\353\354\355\356\357\360\361\362\363\364\365\366\367\370\371\374\373\372\375\376\377]" "" nil nil nil windows-1251) ("slovak" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B") nil iso-8859-2) ("slovenian" "[A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "[^A-Za-z\301\304\311\315\323\332\324\300\305\245\335\256\251\310\317\253\322\341\344\351\355\363\372\364\340\345\265\375\276\271\350\357\273\362]" "" nil ("-B" "-d" "slovenian") nil iso-8859-2) ("svenska" "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]" "[']" nil ("-C") "~list" iso-8859-1))))
 
@@ -16355,9 +16349,9 @@ decimal key must be specified.")
 (custom-autoload (quote keypad-numlock-shifted-setup) "keypad" nil)
 
 (autoload (quote keypad-setup) "keypad" "\
-Set keypad bindings in function-key-map according to SETUP.
+Set keypad bindings in `function-key-map' according to SETUP.
 If optional second argument NUMLOCK is non-nil, the NumLock On bindings
-are changed. Otherwise, the NumLock Off bindings are changed.
+are changed.  Otherwise, the NumLock Off bindings are changed.
 If optional third argument SHIFT is non-nil, the shifted keypad
 keys are bound.
 
@@ -16499,7 +16493,7 @@ the current value of `kmacro-counter').
 
 When defining/executing macro, inserts macro counter and increments
 the counter with ARG or 1 if missing.  With \\[universal-argument],
-inserts previous kmacro-counter (but do not modify counter).
+inserts previous `kmacro-counter' (but do not modify counter).
 
 The macro counter can be modified via \\[kmacro-set-counter] and \\[kmacro-add-counter].
 The format of the counter can be modified via \\[kmacro-set-format].
@@ -20594,15 +20588,10 @@ Output stream is STREAM, or value of `standard-output' (which see).
 \(fn OBJECT &optional STREAM)" nil nil)
 
 (autoload (quote pp-eval-expression) "pp" "\
-Evaluate an expression, then pretty-print value EXPVAL into a new buffer.
-If pretty-printed EXPVAL fits on one line, display it in the echo
-area instead.  Also add EXPVAL to the front of the list
-in the variable `values'.
-
-Non-interactively, the argument is the value, EXPVAL, not the expression
-to evaluate.
+Evaluate EXPRESSION and pretty-print its value.
+Also add the value to the front of the list in the variable `values'.
 
-\(fn EXPVAL)" t nil)
+\(fn EXPRESSION)" t nil)
 
 (autoload (quote pp-eval-last-sexp) "pp" "\
 Run `pp-eval-expression' on sexp before point (which see).
@@ -28147,7 +28136,7 @@ Append thumbnails to `tumme-thumbnail-buffer'.
 \(fn)" t nil)
 
 (autoload (quote tumme-display-thumb) "tumme" "\
-Shorthard for `tumme-display-thumbs' with prefix argument.
+Shorthand for `tumme-display-thumbs' with prefix argument.
 
 \(fn)" t nil)
 
@@ -31092,19 +31081,19 @@ Zone out, completely.
 ;;;;;;  "emulation/viper-cmd.el" "emulation/viper-ex.el" "emulation/viper-init.el"
 ;;;;;;  "emulation/viper-keym.el" "emulation/viper-macs.el" "emulation/viper-mous.el"
 ;;;;;;  "emulation/viper-util.el" "env.el" "erc/erc-backend.el" "erc/erc-goodies.el"
-;;;;;;  "erc/erc-ibuffer.el" "erc/erc-lang.el" "erc/erc-menu.el"
-;;;;;;  "erc/erc-nicklist.el" "eshell/em-alias.el" "eshell/em-banner.el"
-;;;;;;  "eshell/em-basic.el" "eshell/em-cmpl.el" "eshell/em-dirs.el"
-;;;;;;  "eshell/em-glob.el" "eshell/em-hist.el" "eshell/em-ls.el"
-;;;;;;  "eshell/em-pred.el" "eshell/em-prompt.el" "eshell/em-rebind.el"
-;;;;;;  "eshell/em-script.el" "eshell/em-smart.el" "eshell/em-term.el"
-;;;;;;  "eshell/em-unix.el" "eshell/em-xtra.el" "eshell/esh-arg.el"
-;;;;;;  "eshell/esh-cmd.el" "eshell/esh-ext.el" "eshell/esh-groups.el"
-;;;;;;  "eshell/esh-io.el" "eshell/esh-maint.el" "eshell/esh-module.el"
-;;;;;;  "eshell/esh-opt.el" "eshell/esh-proc.el" "eshell/esh-util.el"
-;;;;;;  "eshell/esh-var.el" "ezimage.el" "faces.el" "files.el" "finder-inf.el"
-;;;;;;  "foldout.el" "font-core.el" "font-lock.el" "format.el" "forms-d2.el"
-;;;;;;  "forms-pass.el" "frame.el" "fringe.el" "generic-x.el" "gnus/compface.el"
+;;;;;;  "erc/erc-ibuffer.el" "erc/erc-lang.el" "erc/erc-nicklist.el"
+;;;;;;  "eshell/em-alias.el" "eshell/em-banner.el" "eshell/em-basic.el"
+;;;;;;  "eshell/em-cmpl.el" "eshell/em-dirs.el" "eshell/em-glob.el"
+;;;;;;  "eshell/em-hist.el" "eshell/em-ls.el" "eshell/em-pred.el"
+;;;;;;  "eshell/em-prompt.el" "eshell/em-rebind.el" "eshell/em-script.el"
+;;;;;;  "eshell/em-smart.el" "eshell/em-term.el" "eshell/em-unix.el"
+;;;;;;  "eshell/em-xtra.el" "eshell/esh-arg.el" "eshell/esh-cmd.el"
+;;;;;;  "eshell/esh-ext.el" "eshell/esh-groups.el" "eshell/esh-io.el"
+;;;;;;  "eshell/esh-maint.el" "eshell/esh-module.el" "eshell/esh-opt.el"
+;;;;;;  "eshell/esh-proc.el" "eshell/esh-util.el" "eshell/esh-var.el"
+;;;;;;  "ezimage.el" "faces.el" "files.el" "finder-inf.el" "foldout.el"
+;;;;;;  "font-core.el" "font-lock.el" "format.el" "forms-d2.el" "forms-pass.el"
+;;;;;;  "frame.el" "fringe.el" "generic-x.el" "gnus/compface.el"
 ;;;;;;  "gnus/dig.el" "gnus/dns.el" "gnus/format-spec.el" "gnus/gnus-async.el"
 ;;;;;;  "gnus/gnus-bcklg.el" "gnus/gnus-cite.el" "gnus/gnus-cus.el"
 ;;;;;;  "gnus/gnus-demon.el" "gnus/gnus-dup.el" "gnus/gnus-eform.el"
diff --git a/lisp/ledit.el b/lisp/ledit.el
index 9cfbf5334a4..52ddc2c55a0 100644
--- a/lisp/ledit.el
+++ b/lisp/ledit.el
@@ -1,7 +1,7 @@
 ;;; ledit.el --- Emacs side of ledit interface
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: languages
diff --git a/lisp/loadhist.el b/lisp/loadhist.el
index 4c80619fbdc..c6c767f736c 100644
--- a/lisp/loadhist.el
+++ b/lisp/loadhist.el
@@ -1,7 +1,7 @@
 ;;; loadhist.el --- lisp functions for working with feature groups
 
 ;; Copyright (C) 1995, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
diff --git a/lisp/loadup.el b/lisp/loadup.el
index aa019a8fbcc..1ee27ed427a 100644
--- a/lisp/loadup.el
+++ b/lisp/loadup.el
@@ -1,7 +1,7 @@
 ;;; loadup.el --- load up standardly loaded Lisp files for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/locate.el b/lisp/locate.el
index bb3108210ed..e8dafa79048 100644
--- a/lisp/locate.el
+++ b/lisp/locate.el
@@ -1,7 +1,7 @@
 ;;; locate.el --- interface to the locate command
 
 ;; Copyright (C) 1996, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter Breton <pbreton@cs.umb.edu>
 ;; Keywords: unix files
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 3fd877ac4b2..ed0a5c464e9 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -1,7 +1,7 @@
 ;;; log-edit.el --- Major mode for editing CVS commit messages
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs cvs commit log
diff --git a/lisp/log-view.el b/lisp/log-view.el
index dbee454b7d6..e4f50c15351 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -1,7 +1,7 @@
 ;;; log-view.el --- Major mode for browsing RCS/CVS/SCCS log output
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: rcs sccs cvs log version-control
diff --git a/lisp/longlines.el b/lisp/longlines.el
index af81793ce85..e8ab4fbdd88 100644
--- a/lisp/longlines.el
+++ b/lisp/longlines.el
@@ -1,6 +1,6 @@
 ;;; longlines.el --- automatically wrap long lines
 
-;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Authors:    Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>
 ;;             Alex Schroeder <alex@gnu.org>
@@ -63,7 +63,7 @@ with differing widths."
   "Non-nil means each hard newline is marked on the screen.
 \(The variable `longlines-show-effect' controls what they look like.)
 You can also enable the display temporarily, using the command
-`longlines-show-hard-newlines'"
+`longlines-show-hard-newlines'."
   :group 'longlines
   :type 'boolean)
 
diff --git a/lisp/lpr.el b/lisp/lpr.el
index 2c2e8c872c4..c4eec3fa62b 100644
--- a/lisp/lpr.el
+++ b/lisp/lpr.el
@@ -1,7 +1,7 @@
 ;;; lpr.el --- print Emacs buffer on line printer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix
diff --git a/lisp/ls-lisp.el b/lisp/ls-lisp.el
index 7114fc61660..20da227b010 100644
--- a/lisp/ls-lisp.el
+++ b/lisp/ls-lisp.el
@@ -1,7 +1,7 @@
 ;;; ls-lisp.el --- emulate insert-directory completely in Emacs Lisp
 
 ;; Copyright (C) 1992, 1994, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Modified by: Francis J. Wright <F.J.Wright@maths.qmw.ac.uk>
@@ -151,7 +151,10 @@ Otherwise they are treated as Emacs regexps (for backward compatibility)."
   '("%b %e %H:%M"
     "%b %e  %Y")
   "*List of `format-time-string' specs to display file time stamps.
-They are used whenever a locale is not specified to use instead.
+These specs are used ONLY if a valid locale can not be determined.
+
+If `ls-lisp-use-localized-time-format' is non-nil, these specs are used
+regardless of whether the locale can be determined.
 
 Syntax:  (EARLY-TIME-FORMAT OLD-TIME-FORMAT)
 
@@ -166,6 +169,15 @@ current year. The OLD-TIME-FORMAT is used for older files.  To use ISO
 	       (string :tag "Old time format"))
   :group 'ls-lisp)
 
+(defcustom ls-lisp-use-localized-time-format nil
+  "*Non-nil causes ls-lisp to use `ls-lisp-format-time-list' even if
+a valid locale is specified.
+
+WARNING: Using localized date/time format might cause Dired columns
+to fail to lign up, e.g. if month names are not all of the same length."
+  :type 'boolean
+  :group 'ls-lisp)
+
 (defvar original-insert-directory nil
   "This holds the original function definition of `insert-directory'.")
 
@@ -567,8 +579,12 @@ All ls time options, namely c, t and u, are handled."
 	      (setq locale nil))
 	  (format-time-string
 	   (if (and (<= past-cutoff diff) (<= diff 0))
-	       (if locale "%m-%d %H:%M" (nth 0 ls-lisp-format-time-list))
-	     (if locale "%Y-%m-%d " (nth 1 ls-lisp-format-time-list)))
+	       (if (and locale (not ls-lisp-use-localized-time-format))
+		   "%m-%d %H:%M"
+		 (nth 0 ls-lisp-format-time-list))
+	     (if (and locale (not ls-lisp-use-localized-time-format))
+		 "%Y-%m-%d "
+	       (nth 1 ls-lisp-format-time-list)))
 	   time))
       (error "Unk  0  0000"))))
 
diff --git a/lisp/macros.el b/lisp/macros.el
index ea71bd0da20..66cc4bba28c 100644
--- a/lisp/macros.el
+++ b/lisp/macros.el
@@ -1,7 +1,7 @@
 ;;; macros.el --- non-primitive commands for keyboard macros
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: abbrev
diff --git a/lisp/mail/blessmail.el b/lisp/mail/blessmail.el
index 321dc13cebc..565392c2840 100644
--- a/lisp/mail/blessmail.el
+++ b/lisp/mail/blessmail.el
@@ -1,7 +1,7 @@
 ;;; blessmail.el --- decide whether movemail needs special privileges -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/mail/emacsbug.el b/lisp/mail/emacsbug.el
index 3d4a53b9f25..725934b63d8 100644
--- a/lisp/mail/emacsbug.el
+++ b/lisp/mail/emacsbug.el
@@ -1,7 +1,7 @@
 ;;; emacsbug.el --- command to report Emacs bugs to appropriate mailing list
 
 ;; Copyright (C) 1985, 1994, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/mail/footnote.el b/lisp/mail/footnote.el
index b2374490026..2dd2e7af175 100644
--- a/lisp/mail/footnote.el
+++ b/lisp/mail/footnote.el
@@ -1,7 +1,7 @@
 ;;; footnote.el --- footnote support for message mode  -*- coding: iso-latin-1;-*-
 
 ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Steven L Baur <steve@xemacs.org>
 ;; Keywords: mail, news
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index d891a031e59..9e1b94d8b7a 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -1,7 +1,7 @@
 ;;; mail-extr.el --- extract full name and address from RFC 822 mail header -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@cs.bu.edu>
 ;; Maintainer: FSF
diff --git a/lisp/mail/mail-hist.el b/lisp/mail/mail-hist.el
index c718110e9ec..9efdc892684 100644
--- a/lisp/mail/mail-hist.el
+++ b/lisp/mail/mail-hist.el
@@ -1,7 +1,7 @@
 ;;; mail-hist.el --- headers and message body history for outgoing mail
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Created: March, 1994
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index a6b774fc0c9..2f281168440 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -1,7 +1,7 @@
 ;;; mail-utils.el --- utility functions used both by rmail and rnews
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail, news
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 1e32b2d02df..c62cba4822d 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -1,7 +1,7 @@
 ;;; mailabbrev.el --- abbrev-expansion of mail aliases
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1993, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>, now <jwz@jwz.org>
 ;; Maintainer: FSF
diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index d22507c7722..62296ea0228 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -1,7 +1,7 @@
 ;;; mailalias.el --- expand and complete mailing address aliases
 
 ;; Copyright (C) 1985, 1987, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/mailclient.el b/lisp/mail/mailclient.el
index 408527be8eb..0b7f595b5e6 100644
--- a/lisp/mail/mailclient.el
+++ b/lisp/mail/mailclient.el
@@ -1,6 +1,6 @@
 ;;; mailclient.el --- mail sending via system's mail client.  -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 2005, 2006 Free Software Foundation
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation
 
 ;; Author: David Reitter <david.reitter@gmail.com>
 ;; Keywords: mail
diff --git a/lisp/mail/mailheader.el b/lisp/mail/mailheader.el
index 4b6579fb6cb..2eed90b6972 100644
--- a/lisp/mail/mailheader.el
+++ b/lisp/mail/mailheader.el
@@ -1,7 +1,7 @@
 ;;; mailheader.el --- mail header parsing, merging, formatting
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Erik Naggum <erik@naggum.no>
 ;; Keywords: tools, mail, news
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 4c6ef4bf928..22149d79026 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -1,7 +1,7 @@
 ;;; metamail.el --- Metamail interface for GNU Emacs
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Keywords: mail, news, mime, multimedia
diff --git a/lisp/mail/mspools.el b/lisp/mail/mspools.el
index 9084982b304..d299b9af57c 100644
--- a/lisp/mail/mspools.el
+++ b/lisp/mail/mspools.el
@@ -1,7 +1,7 @@
 ;;; mspools.el --- show mail spools waiting to be read
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stephen Eglen <stephen@gnu.org>
 ;; Maintainer: Stephen Eglen <stephen@gnu.org>
diff --git a/lisp/mail/reporter.el b/lisp/mail/reporter.el
index 35c1381d891..cde9a25ec0b 100644
--- a/lisp/mail/reporter.el
+++ b/lisp/mail/reporter.el
@@ -1,7 +1,7 @@
 ;;; reporter.el --- customizable bug reporting of lisp programs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:          1993-1998 Barry A. Warsaw
 ;; Maintainer:      FSF
diff --git a/lisp/mail/rfc2368.el b/lisp/mail/rfc2368.el
index f03e9a635f0..610c0466be5 100644
--- a/lisp/mail/rfc2368.el
+++ b/lisp/mail/rfc2368.el
@@ -1,7 +1,7 @@
 ;;; rfc2368.el --- support for rfc2368
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sen Nagata <sen@eccosys.com>
 ;; Keywords: mail
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index 67ff1e02e89..5afe253b831 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -1,7 +1,7 @@
 ;;; rfc822.el --- hairy rfc822 parser for mail and news and suchlike
 
 ;; Copyright (C) 1986, 1987, 1990, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 14edab92191..d0f4db6f446 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -1,6 +1,6 @@
 ;;; rmail-spam-filter.el  --- spam filter for rmail, the emacs mail reader.
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Keywords: email, spam, filter, rmail
 ;; Author: Eli Tziperman <eli AT deas.harvard.edu>
 
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 148f3913c3e..5c0412fa2be 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1,7 +1,7 @@
 ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/rmailedit.el b/lisp/mail/rmailedit.el
index fe288bb2904..cede2816391 100644
--- a/lisp/mail/rmailedit.el
+++ b/lisp/mail/rmailedit.el
@@ -1,7 +1,7 @@
 ;;; rmailedit.el --- "RMAIL edit mode"  Edit the current message
 
 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/rmailkwd.el b/lisp/mail/rmailkwd.el
index e4583574ede..5e8779e2553 100644
--- a/lisp/mail/rmailkwd.el
+++ b/lisp/mail/rmailkwd.el
@@ -1,7 +1,7 @@
 ;;; rmailkwd.el --- part of the "RMAIL" mail reader for Emacs
 
 ;; Copyright (C) 1985, 1988, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/rmailmsc.el b/lisp/mail/rmailmsc.el
index f7d0885a3ac..dc50f95b921 100644
--- a/lisp/mail/rmailmsc.el
+++ b/lisp/mail/rmailmsc.el
@@ -1,7 +1,7 @@
 ;;; rmailmsc.el --- miscellaneous support functions for the RMAIL mail reader
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index d7b4c591e58..459b51cf504 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -1,7 +1,7 @@
 ;;; rmailout.el --- "RMAIL" mail reader for Emacs: output message to a file
 
 ;; Copyright (C) 1985, 1987, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/rmailsort.el b/lisp/mail/rmailsort.el
index c3f7362b18a..ffa187fc83a 100644
--- a/lisp/mail/rmailsort.el
+++ b/lisp/mail/rmailsort.el
@@ -1,7 +1,7 @@
 ;;; rmailsort.el --- Rmail: sort messages
 
 ;; Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
 ;; Maintainer: FSF
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index c029e6e2268..6383722a4be 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -1,7 +1,7 @@
 ;;; rmailsum.el --- make summary buffers for the mail reader
 
 ;; Copyright (C) 1985, 1993, 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 288e5bd0df3..2bb1a6ed0fa 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1,7 +1,7 @@
 ;;; sendmail.el --- mail sending commands for Emacs.  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1993, 1994, 1995, 1996, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 271c7a76ca2..2dba755081f 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -1,7 +1,7 @@
 ;;; smtpmail.el --- simple SMTP protocol (RFC 821) for sending mail
 
 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Tomoji Kagatani <kagatani@rbc.ncl.omron.co.jp>
 ;; Maintainer: Simon Josefsson <simon@josefsson.org>
diff --git a/lisp/mail/supercite.el b/lisp/mail/supercite.el
index f7beef054b0..8d20ea7d2b2 100644
--- a/lisp/mail/supercite.el
+++ b/lisp/mail/supercite.el
@@ -1,7 +1,7 @@
 ;;; supercite.el --- minor mode for citing mail and news replies
 
 ;; Copyright (C) 1993, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: 1993 Barry A. Warsaw <bwarsaw@python.org>
 ;; Maintainer:    Glenn Morris <rgm@gnu.org>
diff --git a/lisp/mail/uce.el b/lisp/mail/uce.el
index ff53e06014e..b1d6fb046eb 100644
--- a/lisp/mail/uce.el
+++ b/lisp/mail/uce.el
@@ -1,7 +1,7 @@
 ;;; uce.el --- facilitate reply to unsolicited commercial email
 
 ;; Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: stanislav shalunov <shalunov@mccme.ru>
 ;; Created: 10 Dec 1996
diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index fce4e781ff8..ab4fb8b81ef 100644
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -1,7 +1,7 @@
 ;;; undigest.el --- digest-cracking support for the RMAIL mail reader
 
 ;; Copyright (C) 1985, 1986, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 79788ff1dc0..cd0b3444d2c 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -1,7 +1,7 @@
 ;;; unrmail.el --- convert Rmail files to mailbox files
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail
diff --git a/lisp/mail/vms-pmail.el b/lisp/mail/vms-pmail.el
index 3a801565315..c5a149f1005 100644
--- a/lisp/mail/vms-pmail.el
+++ b/lisp/mail/vms-pmail.el
@@ -1,7 +1,7 @@
 ;;; vms-pmail.el --- use Emacs as the editor within VMS mail
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Roland B Roberts <roberts@panix.com>
 ;; Maintainer: FSF
diff --git a/lisp/makefile.w32-in b/lisp/makefile.w32-in
index bbae20fd446..e3ea090d652 100644
--- a/lisp/makefile.w32-in
+++ b/lisp/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006  Free Software Foundation, Inc.
+#                2005, 2006, 2007  Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
@@ -96,11 +96,11 @@ $(lisp)/cus-load.el:
 	touch $@
 # WARNING: Do NOT split the part inside $(ARGQUOTE)s into multiple lines as
 #          this can break with GNU Make 3.81 and later if sh.exe is used.
-custom-deps: $(lisp)/cus-load.el doit
+custom-deps: $(lisp)/cus-load.el $(lisp)/loaddefs.el doit
 	@echo Directories: $(WINS)
 	-$(emacs) -l cus-dep --eval $(ARGQUOTE)(setq find-file-hook nil)$(ARGQUOTE) -f custom-make-dependencies $(lisp) $(WINS)
 
-finder-data: doit
+finder-data: $(lisp)/loaddefs.el doit
 	@echo Directories: $(WINS)
 	$(emacs) -l finder -f finder-compile-keywords-make-dist $(lisp) $(WINS)
 
@@ -324,7 +324,7 @@ $(lisp)/mh-e/mh-loaddefs.el: $(MH_E_SRC)
 pre-mh-loaddefs.el-SH:
 	echo ";;; mh-loaddefs.el --- automatically extracted autoloads" > $@
 	echo ";;" >> $@
-	echo ";; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc." >> $@
+	echo ";; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc." >> $@
 	echo ";; Author: Bill Wohler <wohler@newt.com>" >> $@
 	echo ";; Keywords: mail" >> $@
 	echo ";;; Commentary:" >> $@
@@ -342,7 +342,7 @@ pre-mh-loaddefs.el-SH:
 pre-mh-loaddefs.el-CMD:
 	echo ;;; mh-loaddefs.el --- automatically extracted autoloads> $@
 	echo ;;>> $@
-	echo ;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.>> $@
+	echo ;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.>> $@
 	echo ;; Author: Bill Wohler (wohler@newt.com)>> $@
 	echo ;; Keywords: mail>> $@
 	echo ;;; Commentary:>> $@
diff --git a/lisp/makesum.el b/lisp/makesum.el
index f34906f04f0..a2b5c00aa91 100644
--- a/lisp/makesum.el
+++ b/lisp/makesum.el
@@ -1,7 +1,7 @@
 ;;; makesum.el --- generate key binding summary for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help
diff --git a/lisp/man.el b/lisp/man.el
index 40a4e810204..a6aced25e3d 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1,7 +1,7 @@
 ;;; man.el --- browse UNIX manual pages -*- coding: iso-8859-1 -*-
 
 ;; Copyright (C) 1993, 1994, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Barry A. Warsaw <bwarsaw@cen.com>
 ;; Maintainer: FSF
diff --git a/lisp/master.el b/lisp/master.el
index 186d67e81a3..e2fdbfa559a 100644
--- a/lisp/master.el
+++ b/lisp/master.el
@@ -1,6 +1,6 @@
 ;;; master.el --- make a buffer the master over another buffer
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/menu-bar.el b/lisp/menu-bar.el
index 9f98e3a2122..9595fb941f1 100644
--- a/lisp/menu-bar.el
+++ b/lisp/menu-bar.el
@@ -1,7 +1,7 @@
 ;;; menu-bar.el --- define a default menu bar
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: RMS
 ;; Maintainer: FSF
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 96bb50eec69..c603ecba272 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -2868,7 +2868,7 @@
 	* ChangeLog.1: New file.  Contains old ChangeLog.
 
 
-  Copyright (C) 2005, 2006  Free Software Foundation, Inc.
+  Copyright (C) 2005, 2006, 2007  Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/lisp/mh-e/ChangeLog.1 b/lisp/mh-e/ChangeLog.1
index 40b69964ec3..a28ca7292fc 100644
--- a/lisp/mh-e/ChangeLog.1
+++ b/lisp/mh-e/ChangeLog.1
@@ -11407,7 +11407,7 @@
 	(dist): Leave release in current directory.
 
 
-  Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+  Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
   Copying and distribution of this file, with or without modification,
   are permitted in any medium without royalty provided the copyright
diff --git a/lisp/mh-e/mh-acros.el b/lisp/mh-e/mh-acros.el
index 9fa69fae5d9..90cc1d20be5 100644
--- a/lisp/mh-e/mh-acros.el
+++ b/lisp/mh-e/mh-acros.el
@@ -1,6 +1,6 @@
 ;;; mh-acros.el --- macros used in MH-E
 
-;; Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index 6dba65d69df..99c7b843d80 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -1,7 +1,7 @@
 ;;; mh-alias.el --- MH-E mail alias completion and expansion
 
 ;; Copyright (C) 1994, 1995, 1996, 1997,
-;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-buffers.el b/lisp/mh-e/mh-buffers.el
index f70c0370d0d..d7bf79fbb65 100644
--- a/lisp/mh-e/mh-buffers.el
+++ b/lisp/mh-e/mh-buffers.el
@@ -1,7 +1,7 @@
 ;;; mh-buffers.el --- MH-E buffer constants and utilities
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-comp.el b/lisp/mh-e/mh-comp.el
index a967a2c8d9e..ce012c2f53f 100644
--- a/lisp/mh-e/mh-comp.el
+++ b/lisp/mh-e/mh-comp.el
@@ -1,7 +1,7 @@
 ;;; mh-comp.el --- MH-E functions for composing and sending messages
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-compat.el b/lisp/mh-e/mh-compat.el
index b346a41fad7..2f57e1763ab 100644
--- a/lisp/mh-e/mh-compat.el
+++ b/lisp/mh-e/mh-compat.el
@@ -1,6 +1,6 @@
 ;;; mh-compat.el --- make MH-E compatibile with various versions of Emacs
 
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index 172de5c3798..f7990c0fc45 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1987, 1988,
 ;;  1990, 1992, 1993, 1994, 1995, 1997, 1999,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el
index 282bc118439..a4017384966 100644
--- a/lisp/mh-e/mh-folder.el
+++ b/lisp/mh-e/mh-folder.el
@@ -1,6 +1,6 @@
 ;;; mh-folder.el --- MH-Folder mode
 
-;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index e97533e5724..8ea203965db 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -1,7 +1,7 @@
 ;;; mh-funcs.el --- MH-E functions not everyone will use right away
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-gnus.el b/lisp/mh-e/mh-gnus.el
index 1e3b385eda7..452a12479f5 100644
--- a/lisp/mh-e/mh-gnus.el
+++ b/lisp/mh-e/mh-gnus.el
@@ -1,6 +1,6 @@
 ;;; mh-gnus.el --- make MH-E compatible with various versions of Gnus
 
-;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el
index 4d401bbea55..429776410a6 100644
--- a/lisp/mh-e/mh-identity.el
+++ b/lisp/mh-e/mh-identity.el
@@ -1,6 +1,6 @@
 ;;; mh-identity.el --- multiple identify support for MH-E
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-inc.el b/lisp/mh-e/mh-inc.el
index e35dfc57834..49d7b671245 100644
--- a/lisp/mh-e/mh-inc.el
+++ b/lisp/mh-e/mh-inc.el
@@ -1,6 +1,6 @@
 ;;; mh-inc.el --- MH-E "inc" and separate mail spool handling
 
-;; Copyright (C) 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-junk.el b/lisp/mh-e/mh-junk.el
index f2cb96ca9f7..26b00a158bc 100644
--- a/lisp/mh-e/mh-junk.el
+++ b/lisp/mh-e/mh-junk.el
@@ -1,6 +1,6 @@
 ;;; mh-junk.el --- MH-E interface to anti-spam measures
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
 ;;         Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-letter.el b/lisp/mh-e/mh-letter.el
index d037c09e2aa..615736a7771 100644
--- a/lisp/mh-e/mh-letter.el
+++ b/lisp/mh-e/mh-letter.el
@@ -1,7 +1,7 @@
 ;;; mh-letter.el --- MH-Letter mode
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-limit.el b/lisp/mh-e/mh-limit.el
index 64a61ce499a..7f219ecac06 100644
--- a/lisp/mh-e/mh-limit.el
+++ b/lisp/mh-e/mh-limit.el
@@ -1,6 +1,6 @@
 ;;; mh-limit.el --- MH-E display limits
 
-;; Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Peter S. Galbraith <psg@debian.org>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index a66db002b6a..0f2b7daa741 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,7 @@
 ;;; mh-mime.el --- MH-E MIME support
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-print.el b/lisp/mh-e/mh-print.el
index 9358f485bfd..49c41761df5 100644
--- a/lisp/mh-e/mh-print.el
+++ b/lisp/mh-e/mh-print.el
@@ -1,6 +1,6 @@
 ;;; mh-print.el --- MH-E printing support
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeffrey C Honig <jch@honig.net>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-scan.el b/lisp/mh-e/mh-scan.el
index 8971c93a14d..13f312420bb 100644
--- a/lisp/mh-e/mh-scan.el
+++ b/lisp/mh-e/mh-scan.el
@@ -1,7 +1,7 @@
 ;;; mh-scan.el --- MH-E scan line constants and utilities
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-search.el b/lisp/mh-e/mh-search.el
index 191e42f734a..715556ad16d 100644
--- a/lisp/mh-e/mh-search.el
+++ b/lisp/mh-e/mh-search.el
@@ -1,7 +1,7 @@
 ;;; mh-search  ---  MH-Search mode
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Indexed search by Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-seq.el b/lisp/mh-e/mh-seq.el
index 6d15739fe4d..4914dd5753e 100644
--- a/lisp/mh-e/mh-seq.el
+++ b/lisp/mh-e/mh-seq.el
@@ -1,7 +1,7 @@
 ;;; mh-seq.el --- MH-E sequences support
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-show.el b/lisp/mh-e/mh-show.el
index fb6698467da..f30ad60b041 100644
--- a/lisp/mh-e/mh-show.el
+++ b/lisp/mh-e/mh-show.el
@@ -1,7 +1,7 @@
 ;;; mh-show.el --- MH-Show mode
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-speed.el b/lisp/mh-e/mh-speed.el
index ebf34abbd4c..cdd48475a1f 100644
--- a/lisp/mh-e/mh-speed.el
+++ b/lisp/mh-e/mh-speed.el
@@ -1,6 +1,6 @@
 ;;; mh-speed.el --- MH-E speedbar support
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-thread.el b/lisp/mh-e/mh-thread.el
index 0686b10ac26..ecd8f200cb9 100644
--- a/lisp/mh-e/mh-thread.el
+++ b/lisp/mh-e/mh-thread.el
@@ -1,6 +1,6 @@
 ;;; mh-thread.el --- MH-E threading support
 
-;; Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-tool-bar.el b/lisp/mh-e/mh-tool-bar.el
index a5131420753..18442fc045a 100644
--- a/lisp/mh-e/mh-tool-bar.el
+++ b/lisp/mh-e/mh-tool-bar.el
@@ -1,6 +1,6 @@
 ;;; mh-tool-bar.el --- MH-E tool bar support
 
-;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Satyaki Das <satyaki@theforce.stanford.edu>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index 73a15583165..84f92680d74 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1,7 +1,7 @@
 ;;; mh-utils.el --- MH-E general utilities
 
 ;; Copyright (C) 1993, 1995, 1997,
-;;  2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/mh-e/mh-xface.el b/lisp/mh-e/mh-xface.el
index e6da73339c1..bb553584d0c 100644
--- a/lisp/mh-e/mh-xface.el
+++ b/lisp/mh-e/mh-xface.el
@@ -1,6 +1,6 @@
 ;;; mh-xface.el --- MH-E X-Face and Face header field display
 
-;; Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
diff --git a/lisp/midnight.el b/lisp/midnight.el
index d7cdb1f655d..b20d7eed339 100644
--- a/lisp/midnight.el
+++ b/lisp/midnight.el
@@ -1,7 +1,7 @@
 ;;; midnight.el --- run something every midnight, e.g., kill old buffers
 
 ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Sam Steingold <sds@usa.net>
 ;; Maintainer: Sam Steingold <sds@usa.net>
diff --git a/lisp/minibuf-eldef.el b/lisp/minibuf-eldef.el
index d1c407c6eca..7d6442f6b0d 100644
--- a/lisp/minibuf-eldef.el
+++ b/lisp/minibuf-eldef.el
@@ -1,7 +1,7 @@
 ;;; minibuf-eldef.el --- Only show defaults in prompts when applicable
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience
diff --git a/lisp/misc.el b/lisp/misc.el
index 76e5842e20c..a9636a62f16 100644
--- a/lisp/misc.el
+++ b/lisp/misc.el
@@ -1,7 +1,7 @@
 ;;; misc.el --- some nonstandard basic editing commands for Emacs
 
 ;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: convenience
diff --git a/lisp/mouse-copy.el b/lisp/mouse-copy.el
index 216cc5360d6..880bdbb9029 100644
--- a/lisp/mouse-copy.el
+++ b/lisp/mouse-copy.el
@@ -1,7 +1,7 @@
 ;;; mouse-copy.el --- one-click text copy and move
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el
index 446ef27a030..0e4857658eb 100644
--- a/lisp/mouse-drag.el
+++ b/lisp/mouse-drag.el
@@ -1,7 +1,7 @@
 ;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
 
 ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Heidemann <johnh@ISI.EDU>
 ;; Keywords: mouse
diff --git a/lisp/mouse-sel.el b/lisp/mouse-sel.el
index 5c3e79ed807..a421c8bb10b 100644
--- a/lisp/mouse-sel.el
+++ b/lisp/mouse-sel.el
@@ -1,7 +1,7 @@
 ;;; mouse-sel.el --- multi-click selection support for Emacs 19
 
 ;; Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mdub@bigfoot.com>
 ;; Keywords: mouse
diff --git a/lisp/mouse.el b/lisp/mouse.el
index b60552f1183..c221a9bee99 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1,7 +1,7 @@
 ;;; mouse.el --- window system-independent mouse support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware, mouse
@@ -1041,19 +1041,19 @@ should only be used by mouse-drag-region."
 	      (if do-multi-click (goto-char start-point))
               (delete-overlay mouse-drag-overlay)
               (when (and (functionp fun)
-	      (= start-hscroll (window-hscroll start-window))
-	      ;; Don't run the up-event handler if the
-	      ;; window start changed in a redisplay after
-	      ;; the mouse-set-point for the down-mouse
-	      ;; event at the beginning of this function.
-	      ;; When the window start has changed, the
-	      ;; up-mouse event will contain a different
-	      ;; position due to the new window contents,
-	      ;; and point is set again.
-	      (or end-point
-		  (= (window-start start-window)
-		     start-window-start)))
-                (when (and on-link
+			 (= start-hscroll (window-hscroll start-window))
+			 ;; Don't run the up-event handler if the
+			 ;; window start changed in a redisplay after
+			 ;; the mouse-set-point for the down-mouse
+			 ;; event at the beginning of this function.
+			 ;; When the window start has changed, the
+			 ;; up-mouse event will contain a different
+			 ;; position due to the new window contents,
+			 ;; and point is set again.
+			 (or end-point
+			     (= (window-start start-window)
+				start-window-start)))
+		(when (and on-link
 			   (or (not end-point) (= end-point start-point))
 			   (consp event)
 			   (or remap-double-click
diff --git a/lisp/msb.el b/lisp/msb.el
index aa42e183007..55dd40a91ba 100644
--- a/lisp/msb.el
+++ b/lisp/msb.el
@@ -1,7 +1,7 @@
 ;;; msb.el --- customizable buffer-selection with multiple menus
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Lindberg <lars.lindberg@home.se>
 ;; Maintainer: FSF
diff --git a/lisp/mwheel.el b/lisp/mwheel.el
index b61971c7ea5..7996554a9ec 100644
--- a/lisp/mwheel.el
+++ b/lisp/mwheel.el
@@ -1,7 +1,7 @@
 ;;; mwheel.el --- Wheel mouse support
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2002, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Maintainer: William M. Perry <wmperry@gnu.org>
 ;; Keywords: mouse
 
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 75c9b04a040..19041d046db 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -1,7 +1,7 @@
 ;;; ange-ftp.el --- transparent FTP support for GNU Emacs
 
 ;; Copyright (C) 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com)
 ;; Maintainer: FSF
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 33006731622..b3276ef9c40 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -1,7 +1,7 @@
 ;;; browse-url.el --- pass a URL to a WWW browser
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
 ;; Maintainer: FSF
diff --git a/lisp/net/eudc-bob.el b/lisp/net/eudc-bob.el
index 7aa6279d92d..6f205501a75 100644
--- a/lisp/net/eudc-bob.el
+++ b/lisp/net/eudc-bob.el
@@ -1,7 +1,7 @@
 ;;; eudc-bob.el --- Binary Objects Support for EUDC
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-export.el b/lisp/net/eudc-export.el
index 706c98df371..54ae329c5ef 100644
--- a/lisp/net/eudc-export.el
+++ b/lisp/net/eudc-export.el
@@ -1,7 +1,7 @@
 ;;; eudc-export.el --- functions to export EUDC query results
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-hotlist.el b/lisp/net/eudc-hotlist.el
index 84c4c2549e2..2490b135782 100644
--- a/lisp/net/eudc-hotlist.el
+++ b/lisp/net/eudc-hotlist.el
@@ -1,7 +1,7 @@
 ;;; eudc-hotlist.el --- hotlist management for EUDC
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc-vars.el b/lisp/net/eudc-vars.el
index 1cf449c6f52..ad9eddec400 100644
--- a/lisp/net/eudc-vars.el
+++ b/lisp/net/eudc-vars.el
@@ -1,7 +1,7 @@
 ;;; eudc-vars.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudc.el b/lisp/net/eudc.el
index d209fc26e0a..291bcbf4813 100644
--- a/lisp/net/eudc.el
+++ b/lisp/net/eudc.el
@@ -1,7 +1,7 @@
 ;;; eudc.el --- Emacs Unified Directory Client
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-bbdb.el b/lisp/net/eudcb-bbdb.el
index a4350e7c285..89f47ff1f87 100644
--- a/lisp/net/eudcb-bbdb.el
+++ b/lisp/net/eudcb-bbdb.el
@@ -1,7 +1,7 @@
 ;;; eudcb-bbdb.el --- Emacs Unified Directory Client - BBDB Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-ldap.el b/lisp/net/eudcb-ldap.el
index e48812ec2d9..92c487426ed 100644
--- a/lisp/net/eudcb-ldap.el
+++ b/lisp/net/eudcb-ldap.el
@@ -1,7 +1,7 @@
 ;;; eudcb-ldap.el --- Emacs Unified Directory Client - LDAP Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/eudcb-mab.el b/lisp/net/eudcb-mab.el
index 77f9e71878f..5ed151f92e6 100644
--- a/lisp/net/eudcb-mab.el
+++ b/lisp/net/eudcb-mab.el
@@ -1,6 +1,6 @@
 ;;; eudcb-mab.el --- Emacs Unified Directory Client - AddressBook backend
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@newartisans.com>
 ;; Maintainer: FSF
diff --git a/lisp/net/eudcb-ph.el b/lisp/net/eudcb-ph.el
index 44fe521b7b7..055e0bf4ad1 100644
--- a/lisp/net/eudcb-ph.el
+++ b/lisp/net/eudcb-ph.el
@@ -1,7 +1,7 @@
 ;;; eudcb-ph.el --- Emacs Unified Directory Client - CCSO PH/QI Backend
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: Pavel Janík <Pavel@Janik.cz>
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index 44970f7aaf3..775041903ff 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -1,7 +1,7 @@
 ;;; goto-addr.el --- click to browse URL or to send to e-mail address
 
 ;; Copyright (C) 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric Ding <ericding@alum.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7f936ed0bdb..8544b74051a 100644
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,7 +1,7 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
diff --git a/lisp/net/net-utils.el b/lisp/net/net-utils.el
index f6a8c2c2157..86bab7b20c5 100644
--- a/lisp/net/net-utils.el
+++ b/lisp/net/net-utils.el
@@ -1,7 +1,7 @@
 ;;; net-utils.el --- network functions
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Sun Mar 16 1997
diff --git a/lisp/net/netrc.el b/lisp/net/netrc.el
index b386fde7994..e6c40ed6d0d 100644
--- a/lisp/net/netrc.el
+++ b/lisp/net/netrc.el
@@ -1,6 +1,6 @@
 ;;; netrc.el --- .netrc parsing functionality
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: news
diff --git a/lisp/net/newsticker.el b/lisp/net/newsticker.el
index f812cf01c65..509d63e990d 100644
--- a/lisp/net/newsticker.el
+++ b/lisp/net/newsticker.el
@@ -1,6 +1,6 @@
 ;;; newsticker.el --- A Newsticker for Emacs.
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/net/quickurl.el b/lisp/net/quickurl.el
index 48c3cf3cbaf..f3da7b1164f 100644
--- a/lisp/net/quickurl.el
+++ b/lisp/net/quickurl.el
@@ -1,7 +1,7 @@
 ;;; quickurl.el --- insert an URL based on text at point in buffer
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 20305f2dacf..ac2c886a976 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1,6 +1,6 @@
 ;;; rcirc.el --- default, simple IRC client.
 
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ryan Yeske
 ;; URL: http://www.nongnu.org/rcirc
diff --git a/lisp/net/rcompile.el b/lisp/net/rcompile.el
index b8bfdcc0166..c262a129adc 100644
--- a/lisp/net/rcompile.el
+++ b/lisp/net/rcompile.el
@@ -1,7 +1,7 @@
 ;;; rcompile.el --- run a compilation on a remote machine
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Albert    <alon@milcse.rtsg.mot.com>
 ;; Maintainer: FSF
diff --git a/lisp/net/rlogin.el b/lisp/net/rlogin.el
index 6e8b073c639..53b46c80c85 100644
--- a/lisp/net/rlogin.el
+++ b/lisp/net/rlogin.el
@@ -1,7 +1,7 @@
 ;;; rlogin.el --- remote login interface
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
diff --git a/lisp/net/snmp-mode.el b/lisp/net/snmp-mode.el
index 08f4659e5d9..43b12de9706 100644
--- a/lisp/net/snmp-mode.el
+++ b/lisp/net/snmp-mode.el
@@ -1,7 +1,7 @@
 ;;; snmp-mode.el --- SNMP & SNMPv2 MIB major mode
 
 ;; Copyright (C) 1995, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Paul D. Smith <psmith@BayNetworks.com>
 ;; Keywords: data
diff --git a/lisp/net/telnet.el b/lisp/net/telnet.el
index 1b0c50b4322..6452c26c114 100644
--- a/lisp/net/telnet.el
+++ b/lisp/net/telnet.el
@@ -1,7 +1,7 @@
 ;;; telnet.el --- run a telnet session from within an Emacs buffer
 
 ;; Copyright (C) 1985, 1988, 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: William F. Schelter
 ;; Maintainer: FSF
diff --git a/lisp/net/tls.el b/lisp/net/tls.el
index fe089decad0..0f4b1e57c14 100644
--- a/lisp/net/tls.el
+++ b/lisp/net/tls.el
@@ -1,7 +1,7 @@
 ;;; tls.el --- TLS/SSL support via wrapper around GnuTLS
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: comm, tls, gnutls, ssl
diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el
index dc3742c231a..2749a6858c0 100644
--- a/lisp/net/tramp-ftp.el
+++ b/lisp/net/tramp-ftp.el
@@ -1,6 +1,6 @@
 ;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- coding: iso-8859-1; -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el
index 34bb388f855..dfe6216043e 100644
--- a/lisp/net/tramp-smb.el
+++ b/lisp/net/tramp-smb.el
@@ -1,6 +1,6 @@
 ;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
diff --git a/lisp/net/tramp-util.el b/lisp/net/tramp-util.el
index 666471d6429..81857ae4225 100644
--- a/lisp/net/tramp-util.el
+++ b/lisp/net/tramp-util.el
@@ -2,7 +2,7 @@
 ;;; tramp-util.el --- Misc utility functions to use with Tramp
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: kai.grossjohann@gmx.net
 ;; Keywords: comm, extensions, processes
diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el
index c33e8175315..ce047489260 100644
--- a/lisp/net/tramp-uu.el
+++ b/lisp/net/tramp-uu.el
@@ -1,7 +1,7 @@
 ;;; -*- coding: iso-2022-7bit; -*-
 ;;; tramp-uu.el --- uuencode in Lisp
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, terminals
diff --git a/lisp/net/tramp-vc.el b/lisp/net/tramp-vc.el
index 1ecbc806968..eda98364a98 100644
--- a/lisp/net/tramp-vc.el
+++ b/lisp/net/tramp-vc.el
@@ -1,7 +1,7 @@
 ;;; tramp-vc.el --- Version control integration for TRAMP.el
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pittman <daniel@danann.net>
 ;; Keywords: comm, processes
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 4d3ee29c4d6..257fbc4e47b 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4,6 +4,8 @@
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
 ;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
+;; (copyright statements below in code to be updated with the above notice)
+
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;;         Michael Albinus <michael.albinus@gmx.de>
 ;; Keywords: comm, processes
@@ -1791,7 +1793,8 @@ on the remote host.")
 (defvar tramp-perl-encode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -1833,7 +1836,8 @@ This string is passed to `format', so percent characters need to be doubled.")
 (defvar tramp-perl-decode
   "%s -e '
 # This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 use strict;
 
 my %%trans = do {
@@ -3241,8 +3245,13 @@ be a local filename.  The method used must be an out-of-band method."
 
       ;; Use rcp-like program for file transfer.
       (unwind-protect
-          (let ((p (apply 'start-process (buffer-name trampbuf) trampbuf
-                          copy-program copy-args)))
+          (let* ((default-directory
+		   (if (and (stringp default-directory)
+			    (file-accessible-directory-p default-directory))
+		       default-directory
+		     (tramp-temporary-file-directory)))
+		 (p (apply 'start-process (buffer-name trampbuf) trampbuf
+			   copy-program copy-args)))
             (tramp-set-process-query-on-exit-flag p nil)
             (tramp-process-actions p multi-method method user host
                                    tramp-actions-copy-out-of-band))
@@ -3812,10 +3821,14 @@ This will break if COMMAND prints a newline, followed by the value of
 
 	       ;; Here is where loc-enc and loc-dec used to be let-bound.
 	       (if (and (symbolp loc-dec) (fboundp loc-dec))
-		   ;; If local decoding is a function, we call it.
+		   ;; If local decoding is a function, we call it.  We
+		   ;; must disable multibyte, because
+		   ;; `uudecode-decode-region' doesn't handle it
+		   ;; correctly.
 		   (let ((tmpbuf (get-buffer-create " *tramp tmp*")))
 		     (set-buffer tmpbuf)
 		     (erase-buffer)
+		     (set-buffer-multibyte nil)
 		     (insert-buffer-substring tramp-buf)
 		     (tramp-message-for-buffer
 		      multi-method method user host
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 8061b78e124..04f7bc754f2 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -2,7 +2,7 @@
 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol
 ;;; lisp/trampver.el.  Generated from trampver.el.in by configure.
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kai Gro,A_(Bjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
diff --git a/lisp/net/webjump.el b/lisp/net/webjump.el
index cbf298e2f10..7f4fce16bce 100644
--- a/lisp/net/webjump.el
+++ b/lisp/net/webjump.el
@@ -1,7 +1,7 @@
 ;;; webjump.el --- programmable Web hotlist
 
 ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:    Neil W. Van Dyke <nwv@acm.org>
 ;; Created:   09-Aug-1996
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index cd22a21c9c7..7fce0f7bde8 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -1,7 +1,7 @@
 ;;; newcomment.el --- (un)comment regions of buffers
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: code extracted from Emacs-20's simple.el
 ;; Maintainer: Stefan Monnier <monnier@iro.umontreal.ca>
diff --git a/lisp/novice.el b/lisp/novice.el
index fbd2054bcb3..f5c3019dfc2 100644
--- a/lisp/novice.el
+++ b/lisp/novice.el
@@ -1,7 +1,7 @@
 ;;; novice.el --- handling of disabled commands ("novice mode") for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal, help
diff --git a/lisp/obsolete/awk-mode.el b/lisp/obsolete/awk-mode.el
index 7867af0c46c..06376f96dc2 100644
--- a/lisp/obsolete/awk-mode.el
+++ b/lisp/obsolete/awk-mode.el
@@ -1,7 +1,7 @@
 ;;; awk-mode.el --- AWK code editing commands for Emacs
 
 ;; Copyright (C) 1988, 1994, 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: unix, languages
@@ -72,7 +72,7 @@
      ;;
      ;; Keywords.
      (regexp-opt
-      '("BEGIN" "END" "break" "continue" "delete" "exit" "else" "for"
+      '("BEGIN" "END" "break" "continue" "delete" "do" "exit" "else" "for"
 	"getline" "if" "next" "print" "printf" "return" "while") 'words)
      ;;
      ;; Builtins.
diff --git a/lisp/obsolete/bg-mouse.el b/lisp/obsolete/bg-mouse.el
index abb0b9560ce..d0d1024c966 100644
--- a/lisp/obsolete/bg-mouse.el
+++ b/lisp/obsolete/bg-mouse.el
@@ -1,7 +1,7 @@
 ;;; bg-mouse.el --- GNU Emacs code for BBN Bitgraph mouse
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Robinson <jr@bbn-unix.arpa>
 ;;	Stephen Gildea <gildea@bbn.com>
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index e2d1d16d2a6..744b5a53bed 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -1,7 +1,7 @@
 ;;; fast-lock.el --- automagic text properties caching for fast Font Lock mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/float.el b/lisp/obsolete/float.el
index b065b4fe310..ff2e33607a0 100644
--- a/lisp/obsolete/float.el
+++ b/lisp/obsolete/float.el
@@ -1,7 +1,7 @@
 ;;; float.el --- obsolete floating point arithmetic package
 
 ;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Rosenblatt
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/hilit19.el b/lisp/obsolete/hilit19.el
index adb4f7701dc..583e16082c8 100644
--- a/lisp/obsolete/hilit19.el
+++ b/lisp/obsolete/hilit19.el
@@ -1,7 +1,7 @@
 ;;; hilit19.el --- customizable highlighting for Emacs 19
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:   Jonathan Stigelman <stig@hackvan.com>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/hscroll.el b/lisp/obsolete/hscroll.el
index fdf5a7bfbea..adb366c7d41 100644
--- a/lisp/obsolete/hscroll.el
+++ b/lisp/obsolete/hscroll.el
@@ -1,7 +1,7 @@
 ;;; hscroll.el --- automatically scroll truncated lines horizontally
 
 ;; Copyright (C) 1992, 1993, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Wayne Mesard <wmesard@esd.sgi.com>
 ;; Keywords: display
diff --git a/lisp/obsolete/iso-acc.el b/lisp/obsolete/iso-acc.el
index 756833fec4b..176f5b469f8 100644
--- a/lisp/obsolete/iso-acc.el
+++ b/lisp/obsolete/iso-acc.el
@@ -1,7 +1,7 @@
 ;;; iso-acc.el --- minor mode providing electric accent keys
 
 ;; Copyright (C) 1993, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Johan Vromans
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/iso-insert.el b/lisp/obsolete/iso-insert.el
index ac7d5d711ea..79e7acbbe6e 100644
--- a/lisp/obsolete/iso-insert.el
+++ b/lisp/obsolete/iso-insert.el
@@ -1,6 +1,6 @@
 ;;; iso-insert.el --- insert functions for ISO 8859/1  -*- coding: iso-8859-1;-*-
 
-;; Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
diff --git a/lisp/obsolete/iso-swed.el b/lisp/obsolete/iso-swed.el
index 326029006cf..97ecee145c4 100644
--- a/lisp/obsolete/iso-swed.el
+++ b/lisp/obsolete/iso-swed.el
@@ -1,7 +1,7 @@
 ;;; iso-swed.el --- set up char tables for ISO 8859/1 for Swedish/Finnish ttys
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/keyswap.el b/lisp/obsolete/keyswap.el
index de5bd094b8f..3b4237fe90b 100644
--- a/lisp/obsolete/keyswap.el
+++ b/lisp/obsolete/keyswap.el
@@ -1,7 +1,7 @@
 ;;; keyswap.el --- swap BS and DEL keys -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
diff --git a/lisp/obsolete/lazy-lock.el b/lisp/obsolete/lazy-lock.el
index 6dc9f31c066..97893d748a7 100644
--- a/lisp/obsolete/lazy-lock.el
+++ b/lisp/obsolete/lazy-lock.el
@@ -1,7 +1,7 @@
 ;;; lazy-lock.el --- lazy demand-driven fontification for fast Font Lock mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Marshall <simon@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/obsolete/mlsupport.el b/lisp/obsolete/mlsupport.el
index ffe89c4632a..9d3bb8aa6ad 100644
--- a/lisp/obsolete/mlsupport.el
+++ b/lisp/obsolete/mlsupport.el
@@ -1,7 +1,7 @@
 ;;; mlsupport.el --- run-time support for mocklisp code
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: extensions
diff --git a/lisp/obsolete/ooutline.el b/lisp/obsolete/ooutline.el
index 0795031290e..478f7918acd 100644
--- a/lisp/obsolete/ooutline.el
+++ b/lisp/obsolete/ooutline.el
@@ -1,7 +1,7 @@
 ;;; ooutline.el --- outline mode commands for Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: outlines
diff --git a/lisp/obsolete/options.el b/lisp/obsolete/options.el
index 78847e3b277..722f60a53e8 100644
--- a/lisp/obsolete/options.el
+++ b/lisp/obsolete/options.el
@@ -1,7 +1,7 @@
 ;;; options.el --- edit Options command for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/obsolete/profile.el b/lisp/obsolete/profile.el
index 34170a85bc8..999ba706448 100644
--- a/lisp/obsolete/profile.el
+++ b/lisp/obsolete/profile.el
@@ -1,7 +1,7 @@
 ;;; profile.el --- Emacs profiler (OBSOLETE; use elp.el instead)
 
 ;; Copyright (C) 1992, 1994, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boaz Ben-Zvi <boaz@lcs.mit.edu>
 ;; Created: 07 Feb 1992
diff --git a/lisp/obsolete/rnews.el b/lisp/obsolete/rnews.el
index d414a863884..e606e1f9f0a 100644
--- a/lisp/obsolete/rnews.el
+++ b/lisp/obsolete/rnews.el
@@ -1,7 +1,7 @@
 ;;; rnews.el --- USENET news reader for GNU Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: news
diff --git a/lisp/obsolete/rnewspost.el b/lisp/obsolete/rnewspost.el
index e570715f529..54cda95f133 100644
--- a/lisp/obsolete/rnewspost.el
+++ b/lisp/obsolete/rnewspost.el
@@ -1,7 +1,7 @@
 ;;; rnewspost.el --- USENET news poster/mailer for GNU Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: mail, news
diff --git a/lisp/obsolete/rsz-mini.el b/lisp/obsolete/rsz-mini.el
index ce9cae3ff30..acde0287587 100644
--- a/lisp/obsolete/rsz-mini.el
+++ b/lisp/obsolete/rsz-mini.el
@@ -1,7 +1,7 @@
 ;;; rsz-mini.el --- dynamically resize minibuffer to display entire contents
 
 ;; Copyright (C) 1990, 1993, 1994, 1995, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman <friedman@splode.com>
 ;;         Roland McGrath <roland@gnu.org>
diff --git a/lisp/obsolete/scribe.el b/lisp/obsolete/scribe.el
index 1573d0ff859..e5d1394b685 100644
--- a/lisp/obsolete/scribe.el
+++ b/lisp/obsolete/scribe.el
@@ -1,7 +1,7 @@
 ;;; scribe.el --- scribe mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/obsolete/sun-curs.el b/lisp/obsolete/sun-curs.el
index 8d399e852d8..f0275285690 100644
--- a/lisp/obsolete/sun-curs.el
+++ b/lisp/obsolete/sun-curs.el
@@ -1,7 +1,7 @@
 ;;; sun-curs.el --- cursor definitions for Sun windows
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: hardware
diff --git a/lisp/obsolete/sun-fns.el b/lisp/obsolete/sun-fns.el
index eaedf59adc4..55d265c5141 100644
--- a/lisp/obsolete/sun-fns.el
+++ b/lisp/obsolete/sun-fns.el
@@ -1,7 +1,7 @@
 ;;; sun-fns.el --- subroutines of Mouse handling for Sun windows
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Maintainer: none
diff --git a/lisp/obsolete/swedish.el b/lisp/obsolete/swedish.el
index addc7f7cbfc..06962b09d45 100644
--- a/lisp/obsolete/swedish.el
+++ b/lisp/obsolete/swedish.el
@@ -1,6 +1,6 @@
 ;;; swedish.el --- miscellaneous functions for dealing with Swedish
 
-;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
diff --git a/lisp/obsolete/uncompress.el b/lisp/obsolete/uncompress.el
index 7c1ab59fd87..92eb5fae441 100644
--- a/lisp/obsolete/uncompress.el
+++ b/lisp/obsolete/uncompress.el
@@ -1,7 +1,7 @@
 ;;; uncompress.el --- auto-decompression hook for visiting .Z files
 
 ;; Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: files
diff --git a/lisp/obsolete/x-apollo.el b/lisp/obsolete/x-apollo.el
index e67a8f09fd4..98ec9aaff35 100644
--- a/lisp/obsolete/x-apollo.el
+++ b/lisp/obsolete/x-apollo.el
@@ -1,7 +1,7 @@
 ;;; x-apollo.el --- Apollo support functions
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/obsolete/x-menu.el b/lisp/obsolete/x-menu.el
index eff1fbffb08..27c313dde97 100644
--- a/lisp/obsolete/x-menu.el
+++ b/lisp/obsolete/x-menu.el
@@ -1,7 +1,7 @@
 ;;; x-menu.el --- menu support for X
 
 ;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/outline.el b/lisp/outline.el
index 95594ebec9f..20dfb2429ef 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -1,7 +1,7 @@
 ;;; outline.el --- outline mode commands for Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: outlines
@@ -471,19 +471,22 @@ If INVISIBLE-OK is non-nil, an invisible heading line is ok too."
                              (if up "Parent" "Demoted") head)
                      head nil nil t)))))
 
-(defun outline-promote (&optional children)
+(defun outline-promote (&optional which)
   "Promote headings higher up the tree.
-If prefix argument CHILDREN is given, promote also all the children.
-If the region is active in `transient-mark-mode', promote all headings
-in the region."
+If transient-mark-mode is on, and mark is active, promote headings in
+the region (from a Lisp program, pass `region' for WHICH).  Otherwise:
+without prefix argument, promote current heading and all headings in the
+subtree (from a Lisp program, pass `subtree' for WHICH); with prefix
+argument, promote just the current heading (from a Lisp program, pass
+nil for WHICH, or do not pass any argument)."
   (interactive
    (list (if (and transient-mark-mode mark-active) 'region
 	   (outline-back-to-heading)
 	   (if current-prefix-arg nil 'subtree))))
   (cond
-   ((eq children 'region)
+   ((eq which 'region)
     (outline-map-region 'outline-promote (region-beginning) (region-end)))
-   (children
+   (which
     (outline-map-region 'outline-promote
 			(point)
 			(save-excursion (outline-get-next-sibling) (point))))
@@ -507,19 +510,22 @@ in the region."
 
       (replace-match up-head nil t)))))
 
-(defun outline-demote (&optional children)
+(defun outline-demote (&optional which)
   "Demote headings lower down the tree.
-If prefix argument CHILDREN is given, demote also all the children.
-If the region is active in `transient-mark-mode', demote all headings
-in the region."
+If transient-mark-mode is on, and mark is active, demote headings in
+the region (from a Lisp program, pass `region' for WHICH).  Otherwise:
+without prefix argument, demote current heading and all headings in the
+subtree (from a Lisp program, pass `subtree' for WHICH); with prefix
+argument, demote just the current heading (from a Lisp program, pass
+nil for WHICH, or do not pass any argument)."
   (interactive
    (list (if (and transient-mark-mode mark-active) 'region
 	   (outline-back-to-heading)
 	   (if current-prefix-arg nil 'subtree))))
   (cond
-   ((eq children 'region)
+   ((eq which 'region)
     (outline-map-region 'outline-demote (region-beginning) (region-end)))
-   (children
+   (which
     (outline-map-region 'outline-demote
 			(point)
 			(save-excursion (outline-get-next-sibling) (point))))
diff --git a/lisp/paren.el b/lisp/paren.el
index fe928045765..95f718d5683 100644
--- a/lisp/paren.el
+++ b/lisp/paren.el
@@ -1,7 +1,7 @@
 ;;; paren.el --- highlight matching paren
 
 ;; Copyright (C) 1993, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: rms@gnu.org
 ;; Maintainer: FSF
diff --git a/lisp/paths.el b/lisp/paths.el
index 1d8f8c45ed7..2e2ab6584fe 100644
--- a/lisp/paths.el
+++ b/lisp/paths.el
@@ -1,7 +1,7 @@
 ;;; paths.el --- define pathnames for use by various Emacs commands -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1986, 1988, 1994, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -68,7 +68,7 @@ comparison."
 	 (suffixes
 	  ;; Subdirectories in each directory tree that may contain info
 	  ;; directories.
-	  '("" "share/" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
+	  '("share/" "" "gnu/" "gnu/lib/" "gnu/lib/emacs/"
 	    "emacs/" "lib/" "lib/emacs/"))
 	 (standard-info-dirs
 	  (apply #'nconc
@@ -81,10 +81,10 @@ comparison."
 				 dirs
 			       (prune-directory-list dirs config))))
 			 prefixes))))
-    ;; If $(prefix)/info is not one of the standard info directories,
-    ;; they are probably installing an experimental version of Emacs,
-    ;; so make sure that experimental version's Info files override
-    ;; the ones in standard directories.
+    ;; If $(prefix)/share/info is not one of the standard info
+    ;; directories, they are probably installing an experimental
+    ;; version of Emacs, so make sure that experimental version's Info
+    ;; files override the ones in standard directories.
     (if (member config-dir standard-info-dirs)
 	(nconc standard-info-dirs config)
       (cons config-dir standard-info-dirs)))
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 265110358c7..912cd6caca7 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-cvs.el --- functions for dealing with cvs completions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 
diff --git a/lisp/pcmpl-gnu.el b/lisp/pcmpl-gnu.el
index 632cf6731e8..b413ca99231 100644
--- a/lisp/pcmpl-gnu.el
+++ b/lisp/pcmpl-gnu.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-gnu.el --- completions for GNU project tools
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/pcmpl-linux.el b/lisp/pcmpl-linux.el
index c4e56301c7f..ed21d8c337c 100644
--- a/lisp/pcmpl-linux.el
+++ b/lisp/pcmpl-linux.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-linux.el --- functions for dealing with GNU/Linux completions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 0a8df84a689..b84bc28f194 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/pcmpl-unix.el b/lisp/pcmpl-unix.el
index 74b162b5871..9cd5de1e4d1 100644
--- a/lisp/pcmpl-unix.el
+++ b/lisp/pcmpl-unix.el
@@ -1,7 +1,7 @@
 ;;; pcmpl-unix.el --- standard UNIX completions
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/pcomplete.el b/lisp/pcomplete.el
index 0f970c5191a..1ca617a08a5 100644
--- a/lisp/pcomplete.el
+++ b/lisp/pcomplete.el
@@ -1,7 +1,7 @@
 ;;; pcomplete.el --- programmable completion
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: John Wiegley <johnw@gnu.org>
 ;; Keywords: processes abbrev
diff --git a/lisp/pcvs-defs.el b/lisp/pcvs-defs.el
index ac224d3a18a..2641c1cb959 100644
--- a/lisp/pcvs-defs.el
+++ b/lisp/pcvs-defs.el
@@ -1,7 +1,7 @@
 ;;; pcvs-defs.el --- variable definitions for PCL-CVS
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-info.el b/lisp/pcvs-info.el
index b782f0b960d..6e36b5a93e3 100644
--- a/lisp/pcvs-info.el
+++ b/lisp/pcvs-info.el
@@ -1,7 +1,7 @@
 ;;; pcvs-info.el --- internal representation of a fileinfo entry
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-parse.el b/lisp/pcvs-parse.el
index f69f275246a..d9e2f2411a1 100644
--- a/lisp/pcvs-parse.el
+++ b/lisp/pcvs-parse.el
@@ -1,7 +1,7 @@
 ;;; pcvs-parse.el --- the CVS output parser
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/pcvs-util.el b/lisp/pcvs-util.el
index 84ce2e117b9..3945d7ba67c 100644
--- a/lisp/pcvs-util.el
+++ b/lisp/pcvs-util.el
@@ -1,7 +1,7 @@
 ;;; pcvs-util.el --- utility functions for PCL-CVS  -*- byte-compile-dynamic: t -*-
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: pcl-cvs
diff --git a/lisp/pcvs.el b/lisp/pcvs.el
index 001053f742a..4a5f208ad19 100644
--- a/lisp/pcvs.el
+++ b/lisp/pcvs.el
@@ -1,7 +1,7 @@
 ;;; pcvs.el --- a front-end to CVS
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: (The PCL-CVS Trust) pcl-cvs@cyclic.com
 ;;	(Per Cederqvist) ceder@lysator.liu.se
diff --git a/lisp/pgg-def.el b/lisp/pgg-def.el
index 95f0d7658f6..208f10b0a8e 100644
--- a/lisp/pgg-def.el
+++ b/lisp/pgg-def.el
@@ -1,7 +1,7 @@
 ;;; pgg-def.el --- functions/macros for defining PGG functions
 
 ;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff --git a/lisp/pgg-gpg.el b/lisp/pgg-gpg.el
index 514be51a6a3..84bf81a858e 100644
--- a/lisp/pgg-gpg.el
+++ b/lisp/pgg-gpg.el
@@ -1,7 +1,7 @@
 ;;; pgg-gpg.el --- GnuPG support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption and gpg-agent support added by: 
diff --git a/lisp/pgg-parse.el b/lisp/pgg-parse.el
index 40ebcd9b195..4262300aeda 100644
--- a/lisp/pgg-parse.el
+++ b/lisp/pgg-parse.el
@@ -1,7 +1,7 @@
 ;;; pgg-parse.el --- OpenPGP packet parsing
 
 ;; Copyright (C) 1999, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/10/28
diff --git a/lisp/pgg-pgp.el b/lisp/pgg-pgp.el
index aa0cfcf7cb7..1e1bd6d0fd1 100644
--- a/lisp/pgg-pgp.el
+++ b/lisp/pgg-pgp.el
@@ -1,7 +1,7 @@
 ;;; pgg-pgp.el --- PGP 2.* and 6.* support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff --git a/lisp/pgg-pgp5.el b/lisp/pgg-pgp5.el
index 75c96e59909..b438843e73b 100644
--- a/lisp/pgg-pgp5.el
+++ b/lisp/pgg-pgp5.el
@@ -1,7 +1,7 @@
 ;;; pgg-pgp5.el --- PGP 5.* support for PGG.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1999/11/02
diff --git a/lisp/pgg.el b/lisp/pgg.el
index e8a85b58fae..f6a5a96d2b8 100644
--- a/lisp/pgg.el
+++ b/lisp/pgg.el
@@ -1,7 +1,7 @@
 ;;; pgg.el --- glue for the various PGP implementations.
 
 ;; Copyright (C) 1999, 2000, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Symmetric encryption added by: Sascha Wilde <wilde@sha-bang.de>
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index c9850c3afab..e3118042220 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -1,7 +1,7 @@
 ;;; 5x5.el --- simple little puzzle game
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Pearson <davep@davep.org>
 ;; Maintainer: Dave Pearson <davep@davep.org>
diff --git a/lisp/play/animate.el b/lisp/play/animate.el
index 8664023c230..9bad228315a 100644
--- a/lisp/play/animate.el
+++ b/lisp/play/animate.el
@@ -1,7 +1,7 @@
 ;;; animate.el --- make text dance
 
 ;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Richard Stallman <rms@gnu.org>
 ;; Keywords: games
diff --git a/lisp/play/blackbox.el b/lisp/play/blackbox.el
index 10a7c231b30..d6bbc6be5d6 100644
--- a/lisp/play/blackbox.el
+++ b/lisp/play/blackbox.el
@@ -1,7 +1,7 @@
 ;;; blackbox.el --- blackbox game in Emacs Lisp
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: F. Thomas May <uw-nsr!uw-warp!tom@beaver.cs.washington.edu>
 ;; Adapted-By: ESR
diff --git a/lisp/play/bruce.el b/lisp/play/bruce.el
index 185cb5ad264..2a1bdf33b3e 100644
--- a/lisp/play/bruce.el
+++ b/lisp/play/bruce.el
@@ -2,7 +2,7 @@
 ;;; Decency Act snoops, if any.
 
 ;; Copyright (C) 1988, 1993, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index c4c90a83c36..4b795360d39 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -1,7 +1,7 @@
 ;;; cookie1.el --- retrieve random phrases from fortune cookie files
 
-;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006,
-;;   2006 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Maintainer: FSF
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index a8e4ec4c48b..089b4d7699b 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -1,7 +1,7 @@
 ;;; decipher.el --- cryptanalyze monoalphabetic substitution ciphers
 ;;
 ;; Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Christopher J. Madsen <chris_madsen@geocities.com>
 ;; Keywords: games
diff --git a/lisp/play/dissociate.el b/lisp/play/dissociate.el
index b6333234523..8f88bdb9788 100644
--- a/lisp/play/dissociate.el
+++ b/lisp/play/dissociate.el
@@ -1,7 +1,7 @@
 ;;; dissociate.el --- scramble text amusingly for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/play/doctor.el b/lisp/play/doctor.el
index 9a3c45cb3aa..cd88b9cb315 100644
--- a/lisp/play/doctor.el
+++ b/lisp/play/doctor.el
@@ -1,7 +1,7 @@
 ;;; doctor.el --- psychological help for frustrated users
 
 ;; Copyright (C) 1985, 1987, 1994, 1996, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/play/dunnet.el b/lisp/play/dunnet.el
index 930ceac9a71..9e7dddc92e2 100644
--- a/lisp/play/dunnet.el
+++ b/lisp/play/dunnet.el
@@ -1,7 +1,7 @@
 ;;; dunnet.el --- text adventure for Emacs
 
 ;; Copyright (C) 1992, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ron Schnell <ronnie@driver-aces.com>
 ;; Created: 25 Jul 1992
diff --git a/lisp/play/fortune.el b/lisp/play/fortune.el
index 12692292d3a..2e635f312da 100644
--- a/lisp/play/fortune.el
+++ b/lisp/play/fortune.el
@@ -1,7 +1,7 @@
 ;;; fortune.el --- use fortune to create signatures
 
 ;; Copyright (C) 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Holger Schauer <Holger.Schauer@gmx.de>
 ;; Keywords: games utils mail
diff --git a/lisp/play/gamegrid.el b/lisp/play/gamegrid.el
index 5b41cffbb8a..1a2b8c31ef4 100644
--- a/lisp/play/gamegrid.el
+++ b/lisp/play/gamegrid.el
@@ -1,7 +1,7 @@
 ;;; gamegrid.el --- library for implementing grid-based games on Emacs
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Version: 1.02
@@ -420,7 +420,7 @@ static unsigned char gamegrid_bits[] = {
   (if gamegrid-timer
       (if (featurep 'itimer)
           (delete-itimer gamegrid-timer)
-        (timer-set-time gamegrid-timer '(0 0 0) nil)))
+        (cancel-timer gamegrid-timer)))
   (setq gamegrid-timer nil))
 
 ;; ;;;;;;;;;;;;;;; high score functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -515,41 +515,42 @@ FILE is created there."
 (defun gamegrid-add-score-with-update-game-score-1 (file target score)
   (let ((default-directory "/")
 	(errbuf (generate-new-buffer " *update-game-score loss*")))
-    (apply
-     'call-process
-     (append
-      (list
-       (expand-file-name "update-game-score" exec-directory)
-       nil errbuf nil
-       "-m" (int-to-string gamegrid-score-file-length)
-       "-d" (if gamegrid-shared-game-dir
-		(expand-file-name shared-game-score-directory)
-	      (file-name-directory target))
-       file
-       (int-to-string score)
-       (concat
-	(user-full-name)
-	" <"
-	(cond ((fboundp 'user-mail-address)
-	       (user-mail-address))
-	      ((boundp 'user-mail-address)
-	       user-mail-address)
-	      (t ""))
-	">  "
-	(current-time-string)))))
+    ;; This can be called from a timer, so enable local quits.
+    (with-local-quit
+      (apply
+       'call-process
+       (append
+	(list
+	 (expand-file-name "update-game-score" exec-directory)
+	 nil errbuf nil
+	 "-m" (int-to-string gamegrid-score-file-length)
+	 "-d" (if gamegrid-shared-game-dir
+		  (expand-file-name shared-game-score-directory)
+		(file-name-directory target))
+	 file
+	 (int-to-string score)
+	 (concat
+	  (user-full-name)
+	  " <"
+	  (cond ((fboundp 'user-mail-address)
+		 (user-mail-address))
+		((boundp 'user-mail-address)
+		 user-mail-address)
+		(t ""))
+	  ">  "
+	  (current-time-string))))))
     (if (buffer-modified-p errbuf)
 	(progn
 	  (display-buffer errbuf)
 	  (error "Failed to update game score file"))
       (kill-buffer errbuf))
-    (save-excursion
-      (let ((buf (find-buffer-visiting target)))
-	(if buf
-	    (progn
-	      (with-current-buffer buf
-		(revert-buffer nil t nil))
-	      (display-buffer buf))
-	  (find-file-read-only-other-window target))))))
+    (let ((buf (find-buffer-visiting target)))
+      (if buf
+	  (progn
+	    (with-current-buffer buf
+	      (revert-buffer nil t nil))
+	    (display-buffer buf))
+	(find-file-read-only-other-window target)))))
 
 (defun gamegrid-add-score-insecure (file score &optional directory)
   (save-excursion
diff --git a/lisp/play/gametree.el b/lisp/play/gametree.el
index cb556bc0b42..45fa1afba63 100644
--- a/lisp/play/gametree.el
+++ b/lisp/play/gametree.el
@@ -1,7 +1,7 @@
 ;;; gametree.el --- manage game analysis trees in Emacs
 
 ;; Copyright (C) 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ian T Zimmerman <itz@rahul.net>
 ;; Created: Wed Dec 10 07:41:46 PST 1997
diff --git a/lisp/play/gomoku.el b/lisp/play/gomoku.el
index 2df8a9abaad..c05a46b90f6 100644
--- a/lisp/play/gomoku.el
+++ b/lisp/play/gomoku.el
@@ -1,7 +1,7 @@
 ;;; gomoku.el --- Gomoku game between you and Emacs
 
 ;; Copyright (C) 1988, 1994, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
 ;; Maintainer: FSF
diff --git a/lisp/play/handwrite.el b/lisp/play/handwrite.el
index a1dc520973e..bef248e24e9 100644
--- a/lisp/play/handwrite.el
+++ b/lisp/play/handwrite.el
@@ -1,7 +1,7 @@
 ;;; handwrite.el --- turns your emacs buffer into a handwritten document -*- coding: iso-latin-1; -*-
 
 ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Danny Roozendaal (was: <danny@tvs.kun.nl>)
 ;; Created: October 21 1996
diff --git a/lisp/play/landmark.el b/lisp/play/landmark.el
index 3df56133135..4fe126fec0a 100644
--- a/lisp/play/landmark.el
+++ b/lisp/play/landmark.el
@@ -1,7 +1,7 @@
 ;;; landmark.el --- neural-network robot that learns landmarks
 
 ;; Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Terrence Brannon (was: <brannon@rana.usc.edu>)
 ;; Created: December 16, 1996 - first release to usenet
diff --git a/lisp/play/life.el b/lisp/play/life.el
index ddbbcd70c70..b908a0f14b2 100644
--- a/lisp/play/life.el
+++ b/lisp/play/life.el
@@ -1,7 +1,7 @@
 ;;; life.el --- John Horton Conway's `Life' game for GNU Emacs
 
 ;; Copyright (C) 1988, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kyle Jones <kyleuunet.uu.net>
 ;; Maintainer: FSF
diff --git a/lisp/play/morse.el b/lisp/play/morse.el
index 8d569ed3845..7e53f90775c 100644
--- a/lisp/play/morse.el
+++ b/lisp/play/morse.el
@@ -1,7 +1,7 @@
 ;;; morse.el --- convert text to morse code and back             -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rick Farnbach <rick_farnbach@MENTORG.COM>
 ;; Keywords: games
diff --git a/lisp/play/mpuz.el b/lisp/play/mpuz.el
index 6d1cb7a96f6..fdc30c05706 100644
--- a/lisp/play/mpuz.el
+++ b/lisp/play/mpuz.el
@@ -1,7 +1,7 @@
 ;;; mpuz.el --- multiplication puzzle for GNU Emacs
 
 ;; Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Philippe Schnoebelen <phs@lsv.ens-cachan.fr>
 ;; Overhauled: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/play/pong.el b/lisp/play/pong.el
index 4efa8c2a639..4254a4fded4 100644
--- a/lisp/play/pong.el
+++ b/lisp/play/pong.el
@@ -1,7 +1,7 @@
 ;;; pong.el --- classical implementation of pong
 
-;; Copyright 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Benjamin Drieu <bdrieu@april.org>
 ;; Keywords: games
diff --git a/lisp/play/snake.el b/lisp/play/snake.el
index db15e98c47b..c1c9ddfaaf6 100644
--- a/lisp/play/snake.el
+++ b/lisp/play/snake.el
@@ -1,7 +1,7 @@
 ;;; snake.el --- implementation of Snake for Emacs
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Created: 1997-09-10
diff --git a/lisp/play/solitaire.el b/lisp/play/solitaire.el
index a67021c8764..38bc1e4915b 100644
--- a/lisp/play/solitaire.el
+++ b/lisp/play/solitaire.el
@@ -1,7 +1,7 @@
 ;;; solitaire.el --- game of solitaire in Emacs Lisp
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jan Schormann <Jan.Schormann@rechen-gilde.de>
 ;; Created: Fri afternoon, Jun  3,  1994
diff --git a/lisp/play/spook.el b/lisp/play/spook.el
index 828b0a594af..a0ec0280662 100644
--- a/lisp/play/spook.el
+++ b/lisp/play/spook.el
@@ -1,7 +1,7 @@
 ;;; spook.el --- spook phrase utility for overloading the NSA line eater
 
 ;; Copyright (C) 1988, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: games
diff --git a/lisp/play/tetris.el b/lisp/play/tetris.el
index f9fc3f9f0ab..53305a08e66 100644
--- a/lisp/play/tetris.el
+++ b/lisp/play/tetris.el
@@ -1,7 +1,7 @@
 ;;; tetris.el --- implementation of Tetris for Emacs
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Glynn Clements <glynn@sensei.co.uk>
 ;; Version: 2.01
@@ -362,9 +362,9 @@ Element 0 is ignored."
   (setq tetris-pos-y 0)
   (if (tetris-test-shape)
       (tetris-end-game)
-    (tetris-draw-shape))
-  (tetris-draw-next-shape)
-  (tetris-update-score))
+    (tetris-draw-shape)
+    (tetris-draw-next-shape)
+    (tetris-update-score)))
 
 (defun tetris-draw-next-shape ()
   (loop for y from 0 to 3 do
diff --git a/lisp/play/yow.el b/lisp/play/yow.el
index cc79c5a87a5..407c96a9976 100644
--- a/lisp/play/yow.el
+++ b/lisp/play/yow.el
@@ -1,7 +1,7 @@
 ;;; yow.el --- quote random zippyisms
 
 ;; Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Author: Richard Mlynarik
diff --git a/lisp/play/zone.el b/lisp/play/zone.el
index 0f04a043c8e..05f73b8030a 100644
--- a/lisp/play/zone.el
+++ b/lisp/play/zone.el
@@ -1,7 +1,7 @@
 ;;; zone.el --- idle display hacks
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Victor Zandy <zandy@cs.wisc.edu>
 ;; Maintainer: Thien-Thi Nguyen <ttn@gnu.org>
diff --git a/lisp/printing.el b/lisp/printing.el
index 4a41dac8dc4..515ac97c91e 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -1,7 +1,7 @@
 ;;; printing.el --- printing utilities
 
 ;; Copyright (C) 2000, 2001, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ada-mode.el b/lisp/progmodes/ada-mode.el
index c529e3a8265..9581fd436b3 100644
--- a/lisp/progmodes/ada-mode.el
+++ b/lisp/progmodes/ada-mode.el
@@ -1,7 +1,7 @@
 ;;; ada-mode.el --- major-mode for editing Ada sources
 
 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;               2005, 2006  Free Software Foundation, Inc.
+;;               2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Rolf Ebert      <ebert@inf.enst.fr>
 ;;      Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index e1906df5f96..10a5b670c54 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -1,6 +1,6 @@
 ;;; ada-prj.el --- GUI editing of project files for the ada-mode
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot <briot@gnat.com>
diff --git a/lisp/progmodes/ada-stmt.el b/lisp/progmodes/ada-stmt.el
index fa6c680779a..483a54df13b 100644
--- a/lisp/progmodes/ada-stmt.el
+++ b/lisp/progmodes/ada-stmt.el
@@ -1,7 +1,7 @@
 ;;; ada-stmt.el --- an extension to Ada mode for inserting statement templates
 
-;; Copyright(C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-;;              2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1987, 1993, 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+;;              2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/progmodes/ada-xref.el b/lisp/progmodes/ada-xref.el
index 9996a697bb2..9c239ee6dbb 100644
--- a/lisp/progmodes/ada-xref.el
+++ b/lisp/progmodes/ada-xref.el
@@ -1,7 +1,7 @@
 ;; ada-xref.el --- for lookup and completion in Ada mode
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;               2004, 2005, 2006 Free Software Foundation, Inc.
+;;               2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Markus Heritsch <Markus.Heritsch@studbox.uni-stuttgart.de>
 ;;      Rolf Ebert <ebert@inf.enst.fr>
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index e31a94030c3..3b7a2015af5 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -1,6 +1,6 @@
 ;;; antlr-mode.el --- major mode for ANTLR grammar files
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 ;;
 ;; Author: Christoph.Wedler@sap.com
@@ -319,7 +319,7 @@ function and REGEXP is a regular expression.
 
 If `antlr-language' equals to a MODE, the line starting at the first
 non-whitespace is matched by the corresponding REGEXP, and the line is
-part of an header action, indent the line at column 0 instead according
+part of a header action, indent the line at column 0 instead according
 to the normal rules of `antlr-indent-line'."
   :group 'antlr
   :type '(repeat (cons (function :tag "Major mode") regexp)))
@@ -1659,7 +1659,7 @@ Return \(LEVEL OPTION LOCATION)."
 		      :active active))
 	    (sort (mapcar 'car (elt antlr-options-alists (1- level)))
 		  'string-lessp))))
-    
+
 
 ;;;===========================================================================
 ;;;  Insert option: determine section-kind
@@ -1936,7 +1936,7 @@ For OLD, see `antlr-insert-option-do'."
     ;; stuff (no =, {, } or /) at point is not followed by ";"
     (insert ";")
     (backward-char)))
-	
+
 (defun antlr-insert-option-space (area old)
   "Find appropriate place to insert option, insert newlines/spaces.
 For AREA and OLD, see `antlr-insert-option-do'."
@@ -1956,7 +1956,7 @@ For AREA and OLD, see `antlr-insert-option-do'."
 		 (setq orig (point))
 	       (goto-char orig)))
 	(skip-chars-forward " \t")
-	
+
 	(if (looking-at "$\\|//")
 	    ;; just comment after point => skip (+ lines w/ same col comment)
 	    (let ((same (if (> (match-end 0) (match-beginning 0))
diff --git a/lisp/progmodes/asm-mode.el b/lisp/progmodes/asm-mode.el
index ebb532a3525..3ca8c671e8c 100644
--- a/lisp/progmodes/asm-mode.el
+++ b/lisp/progmodes/asm-mode.el
@@ -1,6 +1,6 @@
 ;;; asm-mode.el --- mode for editing assembler code
 
-;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1991, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
diff --git a/lisp/progmodes/autoconf.el b/lisp/progmodes/autoconf.el
index 08a849b16bc..1d08b094351 100644
--- a/lisp/progmodes/autoconf.el
+++ b/lisp/progmodes/autoconf.el
@@ -1,6 +1,6 @@
 ;;; autoconf.el --- mode for editing Autoconf configure.in files
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el
index 847e43a46b7..f9e44d784f1 100644
--- a/lisp/progmodes/cc-align.el
+++ b/lisp/progmodes/cc-align.el
@@ -1,10 +1,11 @@
 ;;; cc-align.el --- custom indentation functions for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2004- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
diff --git a/lisp/progmodes/cc-awk.el b/lisp/progmodes/cc-awk.el
index bc745873638..b0c15bff903 100644
--- a/lisp/progmodes/cc-awk.el
+++ b/lisp/progmodes/cc-awk.el
@@ -1,7 +1,7 @@
 ;;; cc-awk.el --- AWK specific code within cc-mode.
 
 ;; Copyright (C) 1988, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Alan Mackenzie <acm@muc.de> (originally based on awk-mode.el)
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el
index 4a1e22d0c42..b2f793c0b1c 100644
--- a/lisp/progmodes/cc-bytecomp.el
+++ b/lisp/progmodes/cc-bytecomp.el
@@ -1,7 +1,7 @@
 ;;; cc-bytecomp.el --- compile time setup for proper compilation
 
-;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
-;; Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author:     Martin Stjernholm
 ;; Maintainer: bug-cc-mode@gnu.org
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index e7bea0e0b29..96924899ea3 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1,10 +1,11 @@
 ;;; cc-cmds.el --- user level commands for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2003- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
@@ -1382,8 +1383,7 @@ No indentation or other \"electric\" behavior is performed."
   ;;
   ;; This function might do hidden buffer changes.
   (save-excursion
-    (let* (pos
-	   kluge-start
+    (let* (kluge-start
 	   decl-result brace-decl-p
 	   (start (point))
 	   (paren-state (c-parse-state))
@@ -1416,11 +1416,12 @@ No indentation or other \"electric\" behavior is performed."
 	(setq kluge-start (point))
 	(setq decl-result
 	      (car (c-beginning-of-decl-1
+		    ;; NOTE: If we're in a K&R region, this might be the start
+		    ;; of a parameter declaration, not the actual function.
 		    (and least-enclosing ; LIMIT for c-b-of-decl-1
 			 (c-safe-position least-enclosing paren-state)))))
 
 	;; Has the declaration we've gone back to got braces?
-	(setq pos (point))	      ; the search limit for c-recognize-knr-p
 	(setq brace-decl-p
 	      (save-excursion
 		    (and (c-syntactic-re-search-forward "[;{]" nil t t)
@@ -1430,7 +1431,7 @@ No indentation or other \"electric\" behavior is performed."
 				  ;; ';' in a K&R argdecl.  In
 				  ;; that case the declaration
 				  ;; should contain a block.
-				  (c-in-knr-argdecl pos))))))
+				  (c-in-knr-argdecl))))))
 
 	(cond
 	 ((= (point) kluge-start)	; might be BOB or unbalanced parens.
diff --git a/lisp/progmodes/cc-compat.el b/lisp/progmodes/cc-compat.el
index 4d0266ec41c..07433b9630b 100644
--- a/lisp/progmodes/cc-compat.el
+++ b/lisp/progmodes/cc-compat.el
@@ -1,8 +1,8 @@
 ;;; cc-compat.el --- cc-mode compatibility with c-mode.el confusion
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;	       1994-1999 Barry A. Warsaw
diff --git a/lisp/progmodes/cc-defs.el b/lisp/progmodes/cc-defs.el
index b4063554384..1858b43f326 100644
--- a/lisp/progmodes/cc-defs.el
+++ b/lisp/progmodes/cc-defs.el
@@ -1,10 +1,11 @@
 ;;; cc-defs.el --- compile time definitions for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2003- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
@@ -579,6 +580,24 @@ right side of it."
 ;; Wrappers for common scan-lists cases, mainly because it's almost
 ;; impossible to get a feel for how that function works.
 
+(defmacro c-go-list-forward ()
+  "Move backward across one balanced group of parentheses.
+
+Return POINT when we succeed, NIL when we fail.  In the latter case, leave
+point unmoved."
+  `(c-safe (let ((endpos (scan-lists (point) 1 0)))
+	     (goto-char endpos)
+	     endpos)))
+
+(defmacro c-go-list-backward ()
+  "Move backward across one balanced group of parentheses.
+
+Return POINT when we succeed, NIL when we fail.  In the latter case, leave
+point unmoved."
+  `(c-safe (let ((endpos (scan-lists (point) -1 0)))
+	     (goto-char endpos)
+	     endpos)))
+
 (defmacro c-up-list-forward (&optional pos limit)
   "Return the first position after the list sexp containing POS,
 or nil if no such position exists.  The point is used if POS is left out.
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index bacb4670ea0..f05d6632473 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -1,10 +1,11 @@
 ;;; cc-engine.el --- core syntax guessing engine for CC mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2001- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
@@ -6220,65 +6221,101 @@ comment at the start of cc-engine.el for more info."
   ;; `c-recognize-knr-p' is not checked.  If LIM is non-nil, it's a
   ;; position that bounds the backward search for the argument list.
   ;;
-  ;; Note: A declaration level context is assumed; the test can return
-  ;; false positives for statements.
+  ;; Point must be within a possible K&R region, e.g. just before a top-level
+  ;; "{".  It must be outside of parens and brackets.  The test can return
+  ;; false positives otherwise.
   ;;
   ;; This function might do hidden buffer changes.
 
   (save-excursion
     (save-restriction
+      ;; If we're in a macro, our search range is restricted to it.  Narrow to
+      ;; the searchable range.
+      (let* ((macro-start (c-query-macro-start))
+	     (lim (max (or lim (point-min)) (or macro-start (point-min))))
+	     before-lparen after-rparen)
+	(narrow-to-region lim (c-point 'eol))
+
+	;; Search backwards for the defun's argument list.  We give up if we
+	;; encounter a "}" (end of a previous defun) or BOB.
+	;;
+	;; The criterion for a paren structure being the arg list is:
+	;; o - there is non-WS stuff after it but before any "{"; AND
+	;; o - the token after it isn't a ";" AND
+	;; o - it is preceded by either an identifier (the function name) or
+	;;   a macro expansion like "DEFUN (...)"; AND
+	;; o - its content is a non-empty comma-separated list of identifiers
+	;;   (an empty arg list won't have a knr region).
+	;;
+	;; The following snippet illustrates these rules:
+	;; int foo (bar, baz, yuk)
+	;;     int bar [] ;
+	;;     int (*baz) (my_type) ;
+	;;     int (*) (void) (*yuk) (void) ;
+	;; {
+
+	(catch 'knr
+	  (while t ; go round one paren/bracket construct each time round.
+	    (or (c-syntactic-skip-backward "^)]}")
+		(throw 'knr nil))	; no more bpb pairs left.
+	    (cond ((eq (char-before) ?\))
+		   (setq after-rparen (point)))
+		  ((eq (char-before) ?\})
+		   (throw 'knr nil))
+		  (t (setq after-rparen nil))) ; "]"
+
+	    (if after-rparen
+	    ;; We're inside a paren.  Could it be our argument list....?
+	      (if
+		  (and
+		   (progn
+		     (goto-char after-rparen)
+		     (unless (c-go-list-backward) (throw 'knr nil)) ;
+		;; FIXME!!!  What about macros between the parens?  2007/01/20
+		     (setq before-lparen (point)))
 
-      ;; Go back to the closest preceding normal parenthesis sexp.  We
-      ;; take that as the argument list in the function header.  Then
-      ;; check that it's followed by some symbol before the next ';'
-      ;; or '{'.  If it does, it's the header of the K&R argdecl we're
-      ;; in.
-      (if lim (narrow-to-region lim (c-point 'eol)))
-      (let ((outside-macro (not (c-query-macro-start)))
-	    paren-end)
-
-	(catch 'done
-	  (while (if (and (setq paren-end (c-down-list-backward (point)))
-			  (eq (char-after paren-end) ?\)))
-		     (progn
-		       (goto-char (1+ paren-end))
-		       (if outside-macro
-			   (c-beginning-of-macro)))
-		   (throw 'done nil))))
-
-	(and (progn
-	       (c-forward-syntactic-ws)
-	       (looking-at "\\w\\|\\s_"))
-
-	     (save-excursion
-	       ;; The function header in a K&R declaration should only
-	       ;; contain identifiers separated by comma.  It should
-	       ;; also contain at least one identifier since there
-	       ;; wouldn't be anything to declare in the K&R region
-	       ;; otherwise.
-	       (when (c-go-up-list-backward paren-end)
-		 (forward-char)
-		 (catch 'knr-ok
-		   (while t
-		     (c-forward-syntactic-ws)
-		     (if (or (looking-at c-known-type-key)
-			     (looking-at c-keywords-regexp))
-			 (throw 'knr-ok nil))
-		     (c-forward-token-2)
-		     (if (eq (char-after) ?,)
-			 (forward-char)
-		       (throw 'knr-ok (and (eq (char-after) ?\))
-					   (= (point) paren-end))))))))
+		   ;; It can't be the arg list if next token is ; or {
+		   (progn (goto-char after-rparen)
+			  (c-forward-syntactic-ws)
+			  (not (memq (char-after) '(?\; ?\{))))
 
-	     (save-excursion
-	       ;; If it's a K&R declaration then we're now at the
-	       ;; beginning of the function arglist.  Check that there
-	       ;; isn't a '=' before it in this statement since that
-	       ;; means it some kind of initialization instead.
-	       (c-syntactic-skip-backward "^;=}{")
-	       (not (eq (char-before) ?=)))
-
-	     (point))))))
+		   ;; Is the thing preceding the list an identifier (the
+		   ;; function name), or a macro expansion?
+		   (progn
+		     (goto-char before-lparen)
+		     (eq (c-backward-token-2) 0)
+		     (or (c-on-identifier)
+			 (and (eq (char-after) ?\))
+			      (c-go-up-list-backward)
+			      (eq (c-backward-token-2) 0)
+			      (c-on-identifier))))
+
+		   ;; Have we got a non-empty list of comma-separated
+		   ;; identifiers?
+		   (progn
+		     (goto-char before-lparen)
+		     (c-forward-token-2) ; to first token inside parens
+		     (and
+		      (c-on-identifier)
+		      (c-forward-token-2)
+		      (catch 'id-list
+			(while (eq (char-after) ?\,)
+			  (c-forward-token-2)
+			  (unless (c-on-identifier) (throw 'id-list nil))
+			  (c-forward-token-2))
+			(eq (char-after) ?\))))))
+
+		  ;; ...Yes.  We've identified the function's argument list.
+		  (throw 'knr
+		       (progn (goto-char after-rparen)
+			      (c-forward-syntactic-ws)
+			      (point)))
+
+		;; ...No.  The current parens aren't the function's arg list.
+		(goto-char before-lparen))
+
+	      (or (c-go-list-backward)	; backwards over [ .... ]
+		  (throw 'knr nil)))))))))
 
 (defun c-skip-conditional ()
   ;; skip forward over conditional at point, including any predicate
diff --git a/lisp/progmodes/cc-fonts.el b/lisp/progmodes/cc-fonts.el
index ab31fa877f7..a880ae9a1fe 100644
--- a/lisp/progmodes/cc-fonts.el
+++ b/lisp/progmodes/cc-fonts.el
@@ -1,6 +1,6 @@
 ;;; cc-fonts.el --- font lock support for CC Mode
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             2002- Martin Stjernholm
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index 6907b56d6c6..fe01ab02ae3 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -1,10 +1,11 @@
 ;;; cc-langs.el --- language specific settings for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2002- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index c54d73db513..514945c269d 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -1,8 +1,8 @@
 ;;; cc-menus.el --- imenu support for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Authors:    1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 993fd102951..e2891bde98d 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -1,8 +1,8 @@
 ;;; cc-mode.el --- major mode for editing C and similar languages
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Authors:    2003- Alan Mackenzie
 ;;             1998- Martin Stjernholm
diff --git a/lisp/progmodes/cc-styles.el b/lisp/progmodes/cc-styles.el
index 98bc4e1f801..228269b67bf 100644
--- a/lisp/progmodes/cc-styles.el
+++ b/lisp/progmodes/cc-styles.el
@@ -1,10 +1,11 @@
 ;;; cc-styles.el --- support for styles in CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2004- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
diff --git a/lisp/progmodes/cc-subword.el b/lisp/progmodes/cc-subword.el
index c1ed9e300e7..29494fdc6a7 100644
--- a/lisp/progmodes/cc-subword.el
+++ b/lisp/progmodes/cc-subword.el
@@ -1,6 +1,6 @@
 ;;; cc-subword.el --- Handling capitalized subwords in a nomenclature
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO
 
diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el
index 2f3e83886d2..3aac25b43ed 100644
--- a/lisp/progmodes/cc-vars.el
+++ b/lisp/progmodes/cc-vars.el
@@ -1,10 +1,11 @@
 ;;; cc-vars.el --- user customization variables for CC Mode
 
 ;; Copyright (C) 1985, 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software
-;;   Foundation, Inc.
+;;   1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
-;; Authors:    1998- Martin Stjernholm
+;; Authors:    2002- Alan Mackenzie
+;;             1998- Martin Stjernholm
 ;;             1992-1999 Barry A. Warsaw
 ;;             1987 Dave Detlefs and Stewart Clamen
 ;;             1985 Richard M. Stallman
diff --git a/lisp/progmodes/cfengine.el b/lisp/progmodes/cfengine.el
index fd10bf3a9c2..756979b3d78 100644
--- a/lisp/progmodes/cfengine.el
+++ b/lisp/progmodes/cfengine.el
@@ -1,6 +1,6 @@
 ;;; cfengine.el --- mode for editing Cfengine files
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
diff --git a/lisp/progmodes/cmacexp.el b/lisp/progmodes/cmacexp.el
index 8531a2f3133..03fb90d992c 100644
--- a/lisp/progmodes/cmacexp.el
+++ b/lisp/progmodes/cmacexp.el
@@ -1,6 +1,6 @@
 ;;; cmacexp.el --- expand C macros in a region
 
-;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1992, 1994, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Francesco Potorti` <pot@gnu.org>
diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el
index c6876fb5d79..3039f614fb2 100644
--- a/lisp/progmodes/compile.el
+++ b/lisp/progmodes/compile.el
@@ -1,7 +1,7 @@
 ;;; compile.el --- run compiler as inferior of Emacs, parse error messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Authors: Roland McGrath <roland@gnu.org>,
 ;;	    Daniel Pfeiffer <occitan@esperanto.org>
@@ -248,7 +248,7 @@ of[ \t]+\"?\\([a-zA-Z]?:?[^\":\n]+\\)\"?:" 3 2 nil (1))
      2 3 4 (1))
 
     (makepp
-     "^makepp: \\(?:\\(?:warning\\(:\\).*?\\|\\(Scanning\\|[LR]e?l?oading makefile\\|Imported\\) \\|.*?\\)\
+     "^makepp\\(?:\\(?:: warning\\(:\\).*?\\|\\(: Scanning\\|: [LR]e?l?oading makefile\\|: Imported\\|log:.*?\\) \\|: .*?\\)\
 `\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]\\)"
      4 5 nil (1 . 2) 3
      ("`\\(\\(\\S +?\\)\\(?::\\([0-9]+\\)\\)?\\)['(]" nil nil
@@ -1494,25 +1494,34 @@ Just inserts the text, but uses `insert-before-markers'."
   (with-current-buffer buffer
     (compilation-buffer-internal-p)))
 
-(defmacro compilation-loop (< property-change 1+ error)
-  `(while (,< n 0)
-      (or (setq pt (,property-change pt 'message))
-	  (error ,error compilation-error))
-      ;; prop 'message usually has 2 changes, on and off, so re-search if off
-      (or (setq msg (get-text-property pt 'message))
-	  (if (setq pt (,property-change pt 'message))
-	      (setq msg (get-text-property pt 'message)))
-	  (error ,error compilation-error))
-      (or (< (cadr msg) compilation-skip-threshold)
-	  (if different-file
-	      (eq (prog1 last (setq last (nth 2 (car msg))))
-		  last))
-	  (if compilation-skip-visited
-	      (nthcdr 4 (car msg)))
-	  (if compilation-skip-to-next-location
-	      (eq (car msg) loc))
-	  ;; count this message only if none of the above are true
-	  (setq n (,1+ n)))))
+(defmacro compilation-loop (< property-change 1+ error limit)
+  `(let (opt)
+     (while (,< n 0)
+       (setq opt pt)
+       (or (setq pt (,property-change pt 'message))
+	   ;; Handle the case where where the first error message is
+	   ;; at the start of the buffer, and n < 0.
+	   (if (or (eq (get-text-property ,limit 'message)
+		       (get-text-property opt 'message))
+		   (eq pt opt))
+	       (error ,error compilation-error)
+	     (setq pt ,limit)))
+       ;; prop 'message usually has 2 changes, on and off, so
+       ;; re-search if off
+       (or (setq msg (get-text-property pt 'message))
+	   (if (setq pt (,property-change pt 'message nil ,limit))
+	       (setq msg (get-text-property pt 'message)))
+	   (error ,error compilation-error))
+       (or (< (cadr msg) compilation-skip-threshold)
+	   (if different-file
+	       (eq (prog1 last (setq last (nth 2 (car msg))))
+		   last))
+	   (if compilation-skip-visited
+	       (nthcdr 4 (car msg)))
+	   (if compilation-skip-to-next-location
+	       (eq (car msg) loc))
+	   ;; count this message only if none of the above are true
+	   (setq n (,1+ n))))))
 
 (defun compilation-next-error (n &optional different-file pt)
   "Move point to the next error in the compilation buffer.
@@ -1542,12 +1551,13 @@ Does NOT find the source line like \\[next-error]."
 	  (compilation-loop > next-single-property-change 1-
 			    (if (get-buffer-process (current-buffer))
 				"No more %ss yet"
-			      "Moved past last %s"))
+			      "Moved past last %s")
+			    (point-max))
 	;; Don't move "back" to message at or before point.
 	;; Pass an explicit (point-min) to make sure pt is non-nil.
 	(setq pt (previous-single-property-change pt 'message nil (point-min)))
 	(compilation-loop < previous-single-property-change 1+
-			  "Moved back before first %s")))
+			  "Moved back before first %s" (point-min))))
     (goto-char pt)
     (or msg
 	(error "No %s here" compilation-error))))
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el
index 14cbaf9c0f4..29f4cc372d3 100644
--- a/lisp/progmodes/cperl-mode.el
+++ b/lisp/progmodes/cperl-mode.el
@@ -1,7 +1,7 @@
 ;;; cperl-mode.el --- Perl code editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;     Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich and Bob Olson
@@ -352,7 +352,15 @@ Can be overwritten by `cperl-hairy' if nil."
 
 (defcustom cperl-electric-keywords nil
   "*Not-nil (and non-null) means keywords are electric in CPerl.
-Can be overwritten by `cperl-hairy' if nil."
+Can be overwritten by `cperl-hairy' if nil.
+
+Uses `abbrev-mode' to do the expansion.  If you want to use your
+own abbrevs in cperl-mode, but do not want keywords to be
+electric, you must redefine `cperl-mode-abbrev-table': do
+\\[edit-abbrevs], search for `cperl-mode-abbrev-table', and, in
+that paragraph, delete the words that appear at the ends of lines and
+that begin with \"cperl-electric\".
+"
   :type '(choice (const null) boolean)
   :group 'cperl-affected-by-hairy)
 
diff --git a/lisp/progmodes/cpp.el b/lisp/progmodes/cpp.el
index 62f74b41a70..65ed00e6d6e 100644
--- a/lisp/progmodes/cpp.el
+++ b/lisp/progmodes/cpp.el
@@ -1,6 +1,6 @@
 ;;; cpp.el --- highlight or hide text according to cpp conditionals
 
-;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
diff --git a/lisp/progmodes/cwarn.el b/lisp/progmodes/cwarn.el
index f0933bba8cd..b1b22ed353d 100644
--- a/lisp/progmodes/cwarn.el
+++ b/lisp/progmodes/cwarn.el
@@ -1,6 +1,6 @@
 ;;; cwarn.el --- highlight suspicious C and C++ constructions
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Anders Lindgren <andersl@andersl.com>
diff --git a/lisp/progmodes/dcl-mode.el b/lisp/progmodes/dcl-mode.el
index c3bc75c0d79..618de7a3345 100644
--- a/lisp/progmodes/dcl-mode.el
+++ b/lisp/progmodes/dcl-mode.el
@@ -1,6 +1,6 @@
 ;;; dcl-mode.el --- major mode for editing DCL command files
 
-;; Copyright (c) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Odd Gripenstam <gripenstamol@decus.se>
diff --git a/lisp/progmodes/delphi.el b/lisp/progmodes/delphi.el
index 44a192ab772..2402f48d7ea 100644
--- a/lisp/progmodes/delphi.el
+++ b/lisp/progmodes/delphi.el
@@ -1,6 +1,6 @@
 ;;; delphi.el --- major mode for editing Delphi source (Object Pascal) in Emacs
 
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ray Blaak <blaak@infomatch.com>
diff --git a/lisp/progmodes/ebnf-abn.el b/lisp/progmodes/ebnf-abn.el
index 604061c7558..48de29808b6 100644
--- a/lisp/progmodes/ebnf-abn.el
+++ b/lisp/progmodes/ebnf-abn.el
@@ -1,7 +1,7 @@
 ;;; ebnf-abn.el --- parser for ABNF (Augmented BNF)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-bnf.el b/lisp/progmodes/ebnf-bnf.el
index b1b57ee1682..443e2c23cd5 100644
--- a/lisp/progmodes/ebnf-bnf.el
+++ b/lisp/progmodes/ebnf-bnf.el
@@ -1,7 +1,7 @@
 ;;; ebnf-bnf.el --- parser for EBNF
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-dtd.el b/lisp/progmodes/ebnf-dtd.el
index c0a4c7b5176..f4c57ea2818 100644
--- a/lisp/progmodes/ebnf-dtd.el
+++ b/lisp/progmodes/ebnf-dtd.el
@@ -1,7 +1,7 @@
 ;;; ebnf-dtd.el --- parser for DTD (Data Type Description for XML)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-ebx.el b/lisp/progmodes/ebnf-ebx.el
index 9c9e514ded2..d506e9cc54d 100644
--- a/lisp/progmodes/ebnf-ebx.el
+++ b/lisp/progmodes/ebnf-ebx.el
@@ -1,7 +1,7 @@
 ;;; ebnf-ebx.el --- parser for EBNF used to specify XML (EBNFX)
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-iso.el b/lisp/progmodes/ebnf-iso.el
index c3d4abd7633..2e666328390 100644
--- a/lisp/progmodes/ebnf-iso.el
+++ b/lisp/progmodes/ebnf-iso.el
@@ -1,6 +1,6 @@
 ;;; ebnf-iso.el --- parser for ISO EBNF
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-otz.el b/lisp/progmodes/ebnf-otz.el
index 5fbcb210565..bcf8032318c 100644
--- a/lisp/progmodes/ebnf-otz.el
+++ b/lisp/progmodes/ebnf-otz.el
@@ -1,7 +1,7 @@
 ;;; ebnf-otz.el --- syntactic chart OpTimiZer
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf-yac.el b/lisp/progmodes/ebnf-yac.el
index 61f710cb789..5defea14d50 100644
--- a/lisp/progmodes/ebnf-yac.el
+++ b/lisp/progmodes/ebnf-yac.el
@@ -1,7 +1,7 @@
 ;;; ebnf-yac.el --- parser for Yacc/Bison
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Sofware Foundation, Inc.
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Maintainer: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 611273f8b5f..d6c3d996774 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -1,6 +1,6 @@
 ;;; ebnf2ps.el --- translate an EBNF to a syntactic chart on PostScript
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
diff --git a/lisp/progmodes/etags.el b/lisp/progmodes/etags.el
index 30cfa1b7b21..eecd4682fd1 100644
--- a/lisp/progmodes/etags.el
+++ b/lisp/progmodes/etags.el
@@ -1,7 +1,7 @@
 ;;; etags.el --- etags facility for Emacs
 
 ;; Copyright (C) 1985, 1986, 1988, 1989, 1992, 1993, 1994, 1995, 1996, 1998,
-;;               2000, 2001, 2002, 2003, 2004, 2005, 2006
+;;               2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;	Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
diff --git a/lisp/progmodes/executable.el b/lisp/progmodes/executable.el
index e74208431a3..932c1f32ec5 100644
--- a/lisp/progmodes/executable.el
+++ b/lisp/progmodes/executable.el
@@ -1,6 +1,6 @@
 ;;; executable.el --- base functionality for executable interpreter scripts -*- byte-compile-dynamic: t -*-
 
-;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
diff --git a/lisp/progmodes/f90.el b/lisp/progmodes/f90.el
index e1cd25934f8..9ee4b515eed 100644
--- a/lisp/progmodes/f90.el
+++ b/lisp/progmodes/f90.el
@@ -1,7 +1,7 @@
 ;;; f90.el --- Fortran-90 mode (free format)
 
 ;; Copyright (C) 1995, 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Torbj\"orn Einarsson <Torbjorn.Einarsson@era.ericsson.se>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/progmodes/flymake.el b/lisp/progmodes/flymake.el
index 9f5031b0e63..80015795cd9 100644
--- a/lisp/progmodes/flymake.el
+++ b/lisp/progmodes/flymake.el
@@ -1,6 +1,7 @@
 ;;; flymake.el -- a universal on-the-fly syntax checker
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author:  Pavel Kobyakov <pk_at_work@yahoo.com>
 ;; Maintainer: Pavel Kobyakov <pk_at_work@yahoo.com>
diff --git a/lisp/progmodes/fortran.el b/lisp/progmodes/fortran.el
index 5c97f60e204..cb843b4ecd8 100644
--- a/lisp/progmodes/fortran.el
+++ b/lisp/progmodes/fortran.el
@@ -1,7 +1,7 @@
 ;;; fortran.el --- Fortran mode for GNU Emacs
 
 ;; Copyright (C) 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-;;               2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;               2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Michael D. Prange <prange@erl.mit.edu>
 ;; Maintainer: Glenn Morris <rgm@gnu.org>
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 980c6b3f07b..c2811a9658a 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -4,7 +4,7 @@
 ;; Maintainer: FSF
 ;; Keywords: unix, tools
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
@@ -123,9 +123,10 @@ address for root variables.")
 (defvar gdb-server-prefix nil)
 (defvar gdb-flush-pending-output nil)
 (defvar gdb-location-alist nil
-  "Alist of breakpoint numbers and full filenames.")
-(defvar gdb-active-process nil "GUD tooltips display variable values when t, \
-and #define directives otherwise.")
+  "Alist of breakpoint numbers and full filenames.  Only used for files that
+Emacs can't find.")
+(defvar gdb-active-process nil
+  "GUD tooltips display variable values when t, and macro definitions otherwise.")
 (defvar gdb-error "Non-nil when GDB is reporting an error.")
 (defvar gdb-macro-info nil
   "Non-nil if GDB knows that the inferior includes preprocessor macro info.")
@@ -273,19 +274,22 @@ detailed description of this mode.
   (gdb command-line)
   (gdb-init-1))
 
-(defcustom gdb-debug-ring-max 128
-  "Maximum size of `gdb-debug-ring'."
+(defcustom gdb-debug-log-max 128
+  "Maximum size of `gdb-debug-log'.  If nil, size is unlimited."
   :group 'gud
-  :type 'integer
+  :type '(choice (integer :tag "Number of elements")
+		 (const   :tag "Unlimited" nil))
   :version "22.1")
 
-(defvar gdb-debug-ring nil
-  "List of commands, most recent first, sent to and replies received from GDB.
-This variable is used to debug GDB-UI.")
+(defvar gdb-debug-log nil
+  "List of commands sent to and replies received from GDB.  Most
+recent commands are listed first.  This list stores only the last
+'gdb-debug-log-max' values.  This variable is used to debug
+GDB-UI.")
 
 ;;;###autoload
 (defcustom gdb-enable-debug nil
-  "Non-nil means record the process input and output in `gdb-debug-ring'."
+  "Non-nil means record the process input and output in `gdb-debug-log'."
   :type 'boolean
   :group 'gud
   :version "22.1")
@@ -316,7 +320,7 @@ Also display the main routine in the disassembly buffer if present."
   :version "22.1")
 
 (defcustom gdb-many-windows nil
-  "If nil just pop up the GUD buffer unless `gdb-show-main' is t.
+  "If nil, just pop up the GUD buffer unless `gdb-show-main' is t.
 In this case start with two windows: one displaying the GUD
 buffer and the other with the source file with the main routine
 of the debugged program.  Non-nil means display the layout shown
@@ -550,7 +554,7 @@ With arg, use separate IO iff arg is positive."
 	gdb-error nil
 	gdb-macro-info nil
 	gdb-buffer-fringe-width (car (window-fringes))
-	gdb-debug-ring nil
+	gdb-debug-log nil
 	gdb-signalled nil
 	gdb-source-window nil
 	gdb-inferior-status nil
@@ -721,7 +725,7 @@ With arg, enter name of variable to be watched in the minibuffer."
       (message "gud-watch is a no-op in this mode."))))
 
 (defconst gdb-var-create-regexp
-  "name=\"\\(.*?\\)\",.*numchild=\"\\(.*?\\)\",.*type=\"\\(.*?\\)\"")
+  "name=\"\\(.*?\\)\",.*numchild=\"\\(.*?\\)\",\\(?:.*value=\\(\".*\"\\),\\)?.*type=\"\\(.*?\\)\"")
 
 (defun gdb-var-create-handler (expr)
   (goto-char (point-min))
@@ -733,20 +737,23 @@ With arg, enter name of variable to be watched in the minibuffer."
 		      (setq expr (concat gdb-selected-frame "::" expr))
 		    expr)
 		  (match-string 2)
-		  (match-string 3)
-		  nil nil gdb-frame-address)))
+		  (match-string 4)
+		  (if (match-string 3) (read (match-string 3)))
+		   nil gdb-frame-address)))
 	(push var gdb-var-list)
 	(unless (string-equal
 		 speedbar-initial-expansion-list-name "GUD")
 	  (speedbar-change-initial-expansion-list "GUD"))
-	(gdb-enqueue-input
-	 (list
-	  (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
-	      (concat "server interpreter mi \"0-var-evaluate-expression "
-		      (car var) "\"\n")
-	    (concat "0-var-evaluate-expression " (car var) "\n"))
-	  `(lambda () (gdb-var-evaluate-expression-handler
-		       ,(car var) nil)))))
+	(unless (nth 4 var)
+	  (gdb-enqueue-input
+	   (list
+	    (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer)
+		    'gdba)
+		(concat "server interpreter mi \"0-var-evaluate-expression "
+			(car var) "\"\n")
+	      (concat "0-var-evaluate-expression " (car var) "\n"))
+	      `(lambda () (gdb-var-evaluate-expression-handler
+			   ,(car var) nil))))))
     (if (search-forward "Undefined command" nil t)
 	(message-box "Watching expressions requires GDB 6.0 onwards")
       (message-box "No symbol \"%s\" in current context." expr))))
@@ -897,7 +904,7 @@ Changed values are highlighted with the face `font-lock-warning-face'."
   :version "22.1")
 
 (defcustom gdb-max-children 40
-  "Maximum number of children allowed before Emacs asks"
+  "Maximum number of children before expansion requires confirmation."
   :type 'integer
   :group 'gud
   :version "22.1")
@@ -1130,7 +1137,7 @@ This filter may simply queue input for a later time."
     (if gud-running
 	(progn
 	  (let ((item (concat string "\n")))
-	    (if gdb-enable-debug (push (cons 'send item) gdb-debug-ring))
+	    (if gdb-enable-debug (push (cons 'send item) gdb-debug-log))
 	    (process-send-string proc item)))
       (if (and (string-match "\\\\$" string)
 	       (not comint-input-sender-no-newline)) ;;Try to catch C-d.
@@ -1159,7 +1166,7 @@ This filter may simply queue input for a later time."
 
 (defun gdb-send-item (item)
   (setq gdb-flush-pending-output nil)
-  (if gdb-enable-debug (push (cons 'send-item item) gdb-debug-ring))
+  (if gdb-enable-debug (push (cons 'send-item item) gdb-debug-log))
   (setq gdb-current-item item)
   (let ((process (get-buffer-process gud-comint-buffer)))
     (if (eq (buffer-local-value 'gud-minor-mode gud-comint-buffer) 'gdba)
@@ -1510,9 +1517,10 @@ happens to be appropriate."
   (if gdb-flush-pending-output
       nil
     (when gdb-enable-debug
-	(push (cons 'recv string) gdb-debug-ring)
-	(if (> (length gdb-debug-ring) gdb-debug-ring-max)
-	  (setcdr (nthcdr (1- gdb-debug-ring-max) gdb-debug-ring) nil)))
+	(push (cons 'recv string) gdb-debug-log)
+	(if (and gdb-debug-log-max
+		 (> (length gdb-debug-log) gdb-debug-log-max))
+	    (setcdr (nthcdr (1- gdb-debug-log-max) gdb-debug-log) nil)))
     ;; Recall the left over gud-marker-acc from last time.
     (setq gud-marker-acc (concat gud-marker-acc string))
     ;; Start accumulating output for the GUD buffer.
@@ -1780,6 +1788,9 @@ static char *magick[] = {
   "Face for disabled breakpoint icon in fringe."
   :group 'gud)
 
+(defconst gdb-breakpoint-regexp
+  "\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+")
+
 ;; Put breakpoint icons in relevant margins (even those set in the GUD buffer).
 (defun gdb-info-breakpoints-custom ()
   (let ((flag) (bptno))
@@ -1973,9 +1984,6 @@ static char *magick[] = {
       'gdb-invalidate-breakpoints
     'gdbmi-invalidate-breakpoints))
 
-(defconst gdb-breakpoint-regexp
-  "\\([0-9]+\\).*?\\(?:point\\|catch\\s-+\\S-+\\)\\s-+\\S-+\\s-+\\(.\\)\\s-+")
-
 (defun gdb-toggle-breakpoint ()
   "Enable/disable breakpoint at current line."
   (interactive)
@@ -2029,13 +2037,19 @@ static char *magick[] = {
 ;;
 ;; Alas, if your stack is deep, it is costly.
 ;;
+(defcustom gdb-max-frames 40
+  "Maximum number of frames displayed in call stack."
+  :type 'integer
+  :group 'gud
+  :version "22.1")
+
 (gdb-set-buffer-rules 'gdb-stack-buffer
 		      'gdb-stack-buffer-name
 		      'gdb-frames-mode)
 
 (def-gdb-auto-updated-buffer gdb-stack-buffer
   gdb-invalidate-frames
-  "server info stack\n"
+  (concat "server info stack " (number-to-string gdb-max-frames) "\n")
   gdb-info-stack-handler
   gdb-info-stack-custom)
 
@@ -2077,7 +2091,14 @@ static char *magick[] = {
 		(while (re-search-forward "\\(\\(\\sw\\|[_.]\\)+\\)=" el t)
 		  (put-text-property (match-beginning 1) (match-end 1)
 				     'face font-lock-variable-name-face))))
-	    (forward-line 1))))
+	    (forward-line 1))
+	  (forward-line -1)
+	  (when (looking-at "(More stack frames follow...)")
+	    (add-text-properties (match-beginning 0) (match-end 0)
+	     '(mouse-face highlight
+	       gdb-max-frames t
+	       help-echo
+               "mouse-2, RET: customize gdb-max-frames to see more frames")))))
       (when gdb-look-up-stack
 	    (goto-char (point-min))
 	    (when (re-search-forward "\\(\\S-+?\\):\\([0-9]+\\)" nil t)
@@ -2147,16 +2168,21 @@ static char *magick[] = {
     (end-of-line)
     (let* ((start (line-beginning-position))
 	   (pos (re-search-backward "^#*\\([0-9]+\\)" start t))
-	   (n (or (and pos (match-string-no-properties 1)) "0")))
+	   (n (or (and pos (match-string 1)) "0")))
       n)))
 
 (defun gdb-frames-select (&optional event)
   "Select the frame and display the relevant source."
   (interactive (list last-input-event))
   (if event (posn-set-point (event-end event)))
-  (gdb-enqueue-input
-   (list (concat gdb-server-prefix "frame "
-		 (gdb-get-frame-number) "\n") 'ignore)))
+  (if (get-text-property (point) 'gdb-max-frames)
+      (progn
+	(message-box "After setting gdb-max-frames, you need to enter\n\
+another GDB command e.g pwd, to see new frames")
+      (customize-variable-other-window 'gdb-max-frames))
+    (gdb-enqueue-input
+     (list (concat gdb-server-prefix "frame "
+		   (gdb-get-frame-number) "\n") 'ignore))))
 
 
 ;; Threads buffer.  This displays a selectable thread list.
@@ -2581,7 +2607,7 @@ corresponding to the mode line clicked."
 	   (propertize
 	    "-"
 	    'face font-lock-warning-face
-	    'help-echo "mouse-1: Decrement address"
+	    'help-echo "mouse-1: decrement address"
 	    'mouse-face 'mode-line-highlight
 	    'local-map
 	    (gdb-make-header-line-mouse-map
@@ -2601,7 +2627,7 @@ corresponding to the mode line clicked."
 	   "|"
 	   (propertize "+"
 		       'face font-lock-warning-face
-		       'help-echo "mouse-1: Increment address"
+		       'help-echo "mouse-1: increment address"
 		       'mouse-face 'mode-line-highlight
 		       'local-map (gdb-make-header-line-mouse-map
 				   'mouse-1
@@ -2611,7 +2637,7 @@ corresponding to the mode line clicked."
 	   "]: "
 	   (propertize gdb-memory-address
 		       'face font-lock-warning-face
-		       'help-echo "mouse-1: Set memory address"
+		       'help-echo "mouse-1: set memory address"
 		       'mouse-face 'mode-line-highlight
 		       'local-map (gdb-make-header-line-mouse-map
 				   'mouse-1
@@ -2619,7 +2645,7 @@ corresponding to the mode line clicked."
 	   "  Repeat Count: "
 	   (propertize (number-to-string gdb-memory-repeat-count)
 		       'face font-lock-warning-face
-		       'help-echo "mouse-1: Set repeat count"
+		       'help-echo "mouse-1: set repeat count"
 		       'mouse-face 'mode-line-highlight
 		       'local-map (gdb-make-header-line-mouse-map
 				   'mouse-1
@@ -2627,13 +2653,13 @@ corresponding to the mode line clicked."
 	   "  Display Format: "
 	   (propertize gdb-memory-format
 		       'face font-lock-warning-face
-		       'help-echo "mouse-3: Select display format"
+		       'help-echo "mouse-3: select display format"
 		       'mouse-face 'mode-line-highlight
 		       'local-map gdb-memory-format-map)
 	   "  Unit Size: "
 	   (propertize gdb-memory-unit
 		       'face font-lock-warning-face
-		       'help-echo "mouse-3: Select unit size"
+		       'help-echo "mouse-3: select unit size"
 		       'mouse-face 'mode-line-highlight
 		       'local-map gdb-memory-unit-map))))
   (set (make-local-variable 'font-lock-defaults)
@@ -3011,7 +3037,7 @@ of the current session."
       (if (member (if (string-equal gdb-version "pre-6.4")
 		      (file-name-nondirectory buffer-file-name)
 		    buffer-file-name)
-	  gdb-source-file-list)
+		  gdb-source-file-list)
 	  (with-current-buffer (find-buffer-visiting buffer-file-name)
 	    (set (make-local-variable 'gud-minor-mode)
 		 (buffer-local-value 'gud-minor-mode gud-comint-buffer))
@@ -3410,14 +3436,26 @@ in_scope=\"\\(.*?\\)\".*?}")
     (let* ((varnum (match-string 1))
 	   (var (assoc varnum gdb-var-list)))
       (when var
-	(if (string-equal (match-string 3) "false")
-	    (setcar (nthcdr 5 var) 'out-of-scope)
-	  (setcar (nthcdr 5 var) 'changed)
-	  (setcar (nthcdr 4 var)
-		  (read (match-string 2)))))))
-  (setq gdb-pending-triggers
-   (delq 'gdb-var-update gdb-pending-triggers))
-  (gdb-speedbar-update))
+	(let ((match (match-string 3)))
+	  (cond ((string-equal match "false")
+		 (setcar (nthcdr 5 var) 'out-of-scope))
+		((string-equal match "true")
+		 (setcar (nthcdr 5 var) 'changed)
+		 (setcar (nthcdr 4 var)
+			 (read (match-string 2))))
+;;		((string-equal match "invalid")
+;;		 (gdb-enqueue-input
+;;		  (list
+;;		   (if (eq (buffer-local-value
+;;			    'gud-minor-mode gud-comint-buffer) 'gdba)
+;;		       (concat "server interpreter mi \"-var-delete "
+;;			       varnum "\"\n")
+;;		     (concat "-var-delete " varnum "\n"))
+;;		   'ignore)))
+		)))))
+      (setq gdb-pending-triggers
+	    (delq 'gdb-var-update gdb-pending-triggers))
+      (gdb-speedbar-update))
 
 ;; Registers buffer.
 ;;
diff --git a/lisp/progmodes/glasses.el b/lisp/progmodes/glasses.el
index 50d01e9d2e5..580d8d9e4bf 100644
--- a/lisp/progmodes/glasses.el
+++ b/lisp/progmodes/glasses.el
@@ -1,6 +1,6 @@
 ;;; glasses.el --- make cantReadThis readable
 
-;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
 
 ;; Author: Milan Zamazal <pdm@zamazal.org>
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 48692f9742f..c6928768835 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -1,7 +1,7 @@
 ;;; grep.el --- run Grep as inferior of Emacs, parse match messages
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Roland McGrath <roland@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index adc6cd5194d..b9de6fab9bb 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -5,7 +5,7 @@
 ;; Keywords: unix, tools
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 2000, 2001, 2002, 2003,
-;;  2004, 2005, 2006 Free Software Foundation, Inc.
+;;  2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index a100424108d..8096dee59e2 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -1,6 +1,6 @@
 ;;; hideif.el --- hides selected code within ifdef
 
-;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Daniel LaLiberte <liberte@holonexus.org>
diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el
index e50a9a4dda6..35ab0362613 100644
--- a/lisp/progmodes/hideshow.el
+++ b/lisp/progmodes/hideshow.el
@@ -1,7 +1,7 @@
 ;;; hideshow.el --- minor mode cmds to selectively display code/comment blocks
 
 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-;;               2004, 2005, 2006  Free Software Foundation, Inc.
+;;               2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;;      Dan Nicolaescu <dann@ics.uci.edu>
diff --git a/lisp/progmodes/icon.el b/lisp/progmodes/icon.el
index 393ba6dfb08..9c47cf96e2b 100644
--- a/lisp/progmodes/icon.el
+++ b/lisp/progmodes/icon.el
@@ -1,6 +1,6 @@
 ;;; icon.el --- mode for editing Icon code
 
-;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Chris Smith <csmith@convex.com>
diff --git a/lisp/progmodes/idlw-complete-structtag.el b/lisp/progmodes/idlw-complete-structtag.el
index d21105eca80..030f4a9f0c4 100644
--- a/lisp/progmodes/idlw-complete-structtag.el
+++ b/lisp/progmodes/idlw-complete-structtag.el
@@ -1,5 +1,7 @@
 ;;; idlw-complete-structtag.el --- Completion of structure tags.
-;; Copyright (c) 2001,2002,2003,2004,2005,2006 Free Software Foundation
+
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff --git a/lisp/progmodes/idlw-help.el b/lisp/progmodes/idlw-help.el
index 9b812809352..a9ceccac6a0 100644
--- a/lisp/progmodes/idlw-help.el
+++ b/lisp/progmodes/idlw-help.el
@@ -1,6 +1,7 @@
 ;;; idlw-help.el --- HTML Help code for IDLWAVE
-;; Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006 
-;;   Free Software Foundation
+
+;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 ;;
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
diff --git a/lisp/progmodes/idlw-shell.el b/lisp/progmodes/idlw-shell.el
index 9f43aa1f9e8..64f359aa1e7 100644
--- a/lisp/progmodes/idlw-shell.el
+++ b/lisp/progmodes/idlw-shell.el
@@ -1,6 +1,7 @@
 ;; idlw-shell.el --- run IDL as an inferior process of Emacs.
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;;    Free Software Foundation
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;    Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@astro.uva.nl>
diff --git a/lisp/progmodes/idlw-toolbar.el b/lisp/progmodes/idlw-toolbar.el
index 28d184bfac4..ddf08755544 100644
--- a/lisp/progmodes/idlw-toolbar.el
+++ b/lisp/progmodes/idlw-toolbar.el
@@ -1,6 +1,7 @@
 ;;; idlw-toolbar.el --- a debugging toolbar for IDLWAVE
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;; Free Software Foundation
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@astro.uva.nl>
 ;; Maintainer: J.D. Smith <jdsmith@as.arizona.edu>
diff --git a/lisp/progmodes/idlwave.el b/lisp/progmodes/idlwave.el
index 25f05b54b74..b5b1e055465 100644
--- a/lisp/progmodes/idlwave.el
+++ b/lisp/progmodes/idlwave.el
@@ -1,6 +1,7 @@
 ;; idlwave.el --- IDL editing mode for GNU Emacs
-;; Copyright (c) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-;;    Free Software Foundation
+
+;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; Authors: J.D. Smith <jdsmith@as.arizona.edu>
 ;;          Carsten Dominik <dominik@science.uva.nl>
diff --git a/lisp/progmodes/inf-lisp.el b/lisp/progmodes/inf-lisp.el
index 4a50e00063c..02d44e55019 100644
--- a/lisp/progmodes/inf-lisp.el
+++ b/lisp/progmodes/inf-lisp.el
@@ -1,6 +1,6 @@
 ;;; inf-lisp.el --- an inferior-lisp mode
 
-;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
diff --git a/lisp/progmodes/ld-script.el b/lisp/progmodes/ld-script.el
index 461c8b9bcf1..01f9ecbc7a3 100644
--- a/lisp/progmodes/ld-script.el
+++ b/lisp/progmodes/ld-script.el
@@ -1,6 +1,6 @@
 ;;; ld-script.el --- GNU linker script editing mode for Emacs
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Masatake YAMATO<jet@gyve.org>
diff --git a/lisp/progmodes/m4-mode.el b/lisp/progmodes/m4-mode.el
index af719a2854b..734a86b0b99 100644
--- a/lisp/progmodes/m4-mode.el
+++ b/lisp/progmodes/m4-mode.el
@@ -1,6 +1,6 @@
 ;;; m4-mode.el --- m4 code editing commands for Emacs
 
-;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Andrew Csillag <drew_csillag@geocities.com>
diff --git a/lisp/progmodes/make-mode.el b/lisp/progmodes/make-mode.el
index c7341a9f871..6178e7e47cd 100644
--- a/lisp/progmodes/make-mode.el
+++ b/lisp/progmodes/make-mode.el
@@ -1,6 +1,6 @@
 ;;; make-mode.el --- makefile editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Thomas Neumann <tom@smart.bo.open.de>
diff --git a/lisp/progmodes/mantemp.el b/lisp/progmodes/mantemp.el
index d883254fdb7..61b8d3d4d3d 100644
--- a/lisp/progmodes/mantemp.el
+++ b/lisp/progmodes/mantemp.el
@@ -1,6 +1,6 @@
 ;;; mantemp.el --- create manual template instantiations from g++ 2.7.2 output
 
-;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Tom Houlder <thoulder@icor.fr>
diff --git a/lisp/progmodes/meta-mode.el b/lisp/progmodes/meta-mode.el
index 3c4fdc2330e..8215befc1de 100644
--- a/lisp/progmodes/meta-mode.el
+++ b/lisp/progmodes/meta-mode.el
@@ -1,6 +1,6 @@
 ;;; meta-mode.el --- major mode for editing Metafont or MetaPost sources
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Ulrik Vieth <vieth@thphy.uni-duesseldorf.de>
diff --git a/lisp/progmodes/mixal-mode.el b/lisp/progmodes/mixal-mode.el
index 8b7084675d4..d2b78b1d143 100644
--- a/lisp/progmodes/mixal-mode.el
+++ b/lisp/progmodes/mixal-mode.el
@@ -1,6 +1,7 @@
 ;;; mixal-mode.el --- Major mode for the mix asm language.
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007
+;;   Free Software Foundation, Inc.
 
 ;; This program is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU General Public License as
diff --git a/lisp/progmodes/octave-hlp.el b/lisp/progmodes/octave-hlp.el
index 18ea9c1f699..5c2bd2f34ee 100644
--- a/lisp/progmodes/octave-hlp.el
+++ b/lisp/progmodes/octave-hlp.el
@@ -1,6 +1,6 @@
 ;;; octave-hlp.el --- getting help on Octave symbols using info
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
diff --git a/lisp/progmodes/octave-inf.el b/lisp/progmodes/octave-inf.el
index 0f20626c9b9..63f9af50c1e 100644
--- a/lisp/progmodes/octave-inf.el
+++ b/lisp/progmodes/octave-inf.el
@@ -1,6 +1,6 @@
 ;;; octave-inf.el --- running Octave as an inferior Emacs process
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
diff --git a/lisp/progmodes/octave-mod.el b/lisp/progmodes/octave-mod.el
index 998b33ffbc7..be56d388330 100644
--- a/lisp/progmodes/octave-mod.el
+++ b/lisp/progmodes/octave-mod.el
@@ -1,6 +1,6 @@
 ;;; octave-mod.el --- editing Octave source files under Emacs
 
-;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Kurt Hornik <Kurt.Hornik@wu-wien.ac.at>
diff --git a/lisp/progmodes/pascal.el b/lisp/progmodes/pascal.el
index 02d5c509c62..3fe57e00c7a 100644
--- a/lisp/progmodes/pascal.el
+++ b/lisp/progmodes/pascal.el
@@ -1,7 +1,7 @@
 ;;; pascal.el --- major mode for editing pascal source in Emacs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
-;;               2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;               2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Espen Skoglund <esk@gnu.org>
 ;; Keywords: languages
diff --git a/lisp/progmodes/perl-mode.el b/lisp/progmodes/perl-mode.el
index 950e0cba06f..078e94ffbf4 100644
--- a/lisp/progmodes/perl-mode.el
+++ b/lisp/progmodes/perl-mode.el
@@ -1,6 +1,6 @@
 ;;; perl-mode.el --- Perl code editing commands for GNU Emacs
 
-;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1990, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: William F. Mann
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index c29a259c3a6..cb451791dbe 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1,6 +1,6 @@
 ;;; prolog.el --- major mode for editing and running Prolog under Emacs
 
-;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1986, 1987, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Masanobu UMEDA <umerin@mse.kyutech.ac.jp>
diff --git a/lisp/progmodes/ps-mode.el b/lisp/progmodes/ps-mode.el
index 61b075b3bce..db4cd2dd339 100644
--- a/lisp/progmodes/ps-mode.el
+++ b/lisp/progmodes/ps-mode.el
@@ -1,6 +1,6 @@
 ;;; ps-mode.el --- PostScript mode for GNU Emacs
 
-;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author:     Peter Kleiweg <p.c.j.kleiweg@rug.nl>
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 7a62cfa477c..f94a3d63653 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -1,6 +1,6 @@
 ;;; python.el --- silly walks for Python
 
-;; Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/scheme.el b/lisp/progmodes/scheme.el
index ce420015326..a112cee62bb 100644
--- a/lisp/progmodes/scheme.el
+++ b/lisp/progmodes/scheme.el
@@ -1,7 +1,7 @@
 ;;; scheme.el --- Scheme (and DSSSL) editing mode
 
 ;; Copyright (C) 1986, 1987, 1988, 1997, 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006  Free Software Foundation, Inc.
+;;   2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Bill Rozas <jinx@martigny.ai.mit.edu>
 ;; Adapted-by: Dave Love <d.love@dl.ac.uk>
diff --git a/lisp/progmodes/sh-script.el b/lisp/progmodes/sh-script.el
index 636108692fd..2db30ceb4b2 100644
--- a/lisp/progmodes/sh-script.el
+++ b/lisp/progmodes/sh-script.el
@@ -1,7 +1,7 @@
 ;;; sh-script.el --- shell-script editing commands for Emacs
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;;  2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;  2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Version: 2.0f
diff --git a/lisp/progmodes/simula.el b/lisp/progmodes/simula.el
index 4c689a79fc7..89074dc8fe0 100644
--- a/lisp/progmodes/simula.el
+++ b/lisp/progmodes/simula.el
@@ -1,6 +1,6 @@
 ;;; simula.el --- SIMULA 87 code editing commands for Emacs
 
-;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1992, 1994, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Hans Henrik Eriksen <hhe@ifi.uio.no>
diff --git a/lisp/progmodes/sql.el b/lisp/progmodes/sql.el
index afc0f35f26c..a3401dccbcb 100644
--- a/lisp/progmodes/sql.el
+++ b/lisp/progmodes/sql.el
@@ -1,6 +1,6 @@
 ;;; sql.el --- specialized comint.el for SQL interpreters
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;; Free Software Foundation, Inc.
 
 ;; Author: Alex Schroeder <alex@gnu.org>
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el
index b194bb56727..0495b683bad 100644
--- a/lisp/progmodes/tcl.el
+++ b/lisp/progmodes/tcl.el
@@ -1,6 +1,6 @@
 ;;; tcl.el --- Tcl code editing commands for Emacs
 
-;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;           Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
diff --git a/lisp/progmodes/vhdl-mode.el b/lisp/progmodes/vhdl-mode.el
index cc58a09ec59..dbd8e2b080d 100644
--- a/lisp/progmodes/vhdl-mode.el
+++ b/lisp/progmodes/vhdl-mode.el
@@ -1,7 +1,7 @@
 ;;; vhdl-mode.el --- major mode for editing VHDL code
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Authors:     Reto Zimmermann <reto@gnu.org>
 ;;              Rodney J. Whitby <software.vhdl-mode@rwhitby.net>
diff --git a/lisp/progmodes/which-func.el b/lisp/progmodes/which-func.el
index b622e536d26..43c70f67dfb 100644
--- a/lisp/progmodes/which-func.el
+++ b/lisp/progmodes/which-func.el
@@ -1,6 +1,6 @@
 ;;; which-func.el --- print current function in mode line
 
-;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1994, 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;           Free Software Foundation, Inc.
 
 ;; Author:   Alex Rezinsky <alexr@msil.sps.mot.com>
diff --git a/lisp/progmodes/xscheme.el b/lisp/progmodes/xscheme.el
index 0f55c71ac70..d2ec1781a54 100644
--- a/lisp/progmodes/xscheme.el
+++ b/lisp/progmodes/xscheme.el
@@ -1,6 +1,6 @@
 ;;; xscheme.el --- run MIT Scheme under Emacs
 
-;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1986, 1987, 1989, 1990, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
diff --git a/lisp/ps-bdf.el b/lisp/ps-bdf.el
index eff8ff5eae2..750d724f9f2 100644
--- a/lisp/ps-bdf.el
+++ b/lisp/ps-bdf.el
@@ -1,8 +1,8 @@
 ;;; ps-bdf.el --- BDF font file handler for ps-print
 
-;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   Free Software Foundation, Inc.
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 ;;   National Institute of Advanced Industrial Science and Technology (AIST)
 ;;   Registration Number H14PRO021
 
diff --git a/lisp/ps-mule.el b/lisp/ps-mule.el
index 9c8f09cd716..ec9a66d1d35 100644
--- a/lisp/ps-mule.el
+++ b/lisp/ps-mule.el
@@ -1,7 +1,7 @@
 ;;; ps-mule.el --- provide multi-byte character facility to ps-print
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;;	Kenichi Handa <handa@m17n.org> (multi-byte characters)
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 9bc37f5451c..ca8cada2b2e 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1,7 +1,7 @@
 ;;; ps-print.el --- print text from the buffer as PostScript
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jim Thompson (was <thompson@wg2.waii.com>)
 ;;	Jacques Duthen (was <duthen@cegelec-red.fr>)
@@ -10,11 +10,11 @@
 ;; Maintainer: Kenichi Handa <handa@m17n.org> (multi-byte characters)
 ;;	Vinicius Jose Latorre <viniciusjl@ig.com.br>
 ;; Keywords: wp, print, PostScript
-;; Version: 6.7
+;; Version: 6.7.2
 ;; X-URL: http://www.emacswiki.org/cgi-bin/wiki/ViniciusJoseLatorre
 
-(defconst ps-print-version "6.7"
-  "ps-print.el, v 6.7 <2006/12/01 vinicius>
+(defconst ps-print-version "6.7.2"
+  "ps-print.el, v 6.7.2 <2007/01/26 vinicius>
 
 Vinicius's last change version -- this file may have been edited as part of
 Emacs without changes to the version number.  When reporting bugs, please also
@@ -1490,6 +1490,7 @@ Please send all bug fixes and enhancements to
 (defalias 'ps-x-font-instance-properties      'font-instance-properties)
 (defalias 'ps-x-make-color-instance           'make-color-instance)
 (defalias 'ps-x-map-extents                   'map-extents)
+(defalias 'ps-x-frame-property                'frame-property)
 
 ;; GNU Emacs
 (defalias 'ps-e-face-bold-p         'face-bold-p)
@@ -1500,6 +1501,7 @@ Please send all bug fixes and enhancements to
 (defalias 'ps-e-overlay-end         'overlay-end)
 (defalias 'ps-e-x-color-values      'x-color-values)
 (defalias 'ps-e-color-values        'color-values)
+(defalias 'ps-e-frame-parameter     'frame-parameter)
 (if (fboundp 'find-composition)
     (defalias 'ps-e-find-composition 'find-composition)
   (defalias 'ps-e-find-composition 'ignore))
@@ -1523,6 +1525,8 @@ Please send all bug fixes and enhancements to
 	 (ps-xemacs-color-name (face-foreground face)))
        (defun ps-face-background-name (face)
 	 (ps-xemacs-color-name (face-background face)))
+       (defun ps-frame-parameter (param)
+	 (ps-x-frame-property nil param))
        )
       (t				; emacs 22 or higher
        (defvar mark-active nil)
@@ -1531,7 +1535,10 @@ Please send all bug fixes and enhancements to
        (defun ps-face-foreground-name (face)
 	 (face-foreground face nil t))
        (defun ps-face-background-name (face)
-	 (face-background face nil t))))
+	 (face-background face nil t))
+       (defun ps-frame-parameter (param)
+	 (ps-e-frame-parameter nil param))
+       ))
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -2985,8 +2992,8 @@ Any other value is treated as t."
   :version "20"
   :group 'ps-print-color)
 
-(defcustom ps-default-fg '(0.0 0.0 0.0) ; black
-  "*RGB values of the default foreground color.  Defaults to black.
+(defcustom ps-default-fg 'frame-parameter
+  "*RGB values of the default foreground color.
 
 The `ps-default-fg' variable contains the default foreground color used by
 ps-print, that is, if there is a face in a text that doesn't have a foreground
@@ -2996,6 +3003,8 @@ Valid values are:
 
    t		The foreground color of Emacs session will be used.
 
+   frame-parameter	The foreground-color frame parameter will be used.
+
    NUMBER	It's a real value between 0.0 (black) and 1.0 (white) that
 		indicate the gray color.
 
@@ -3010,12 +3019,13 @@ Valid values are:
 		Where RED, GREEN and BLUE are reals between 0.0 (no color) and
 		1.0 (full color).
 
-Any other value is ignored and black will be used.
+Any other value is ignored and black color will be used.
 
 It's used only when `ps-print-color-p' is non-nil."
   :type '(choice :menu-tag "Default Foreground Gray/Color"
 		 :tag "Default Foreground Gray/Color"
 		 (const :tag "Session Foreground" t)
+		 (const :tag "Frame Foreground" frame-parameter)
 		 (number :tag "Gray Scale" :value 0.0)
 		 (string :tag "Color Name" :value "black")
 		 (list :tag "RGB Color" :value (0.0 0.0 0.0)
@@ -3025,8 +3035,8 @@ It's used only when `ps-print-color-p' is non-nil."
   :version "20"
   :group 'ps-print-color)
 
-(defcustom ps-default-bg '(1.0 1.0 1.0) ; white
-  "*RGB values of the default background color.  Defaults to white.
+(defcustom ps-default-bg 'frame-parameter
+  "*RGB values of the default background color.
 
 The `ps-default-bg' variable contains the default background color used by
 ps-print, that is, if there is a face in a text that doesn't have a background
@@ -3036,6 +3046,8 @@ Valid values are:
 
    t		The background color of Emacs session will be used.
 
+   frame-parameter	The background-color frame parameter will be used.
+
    NUMBER	It's a real value between 0.0 (black) and 1.0 (white) that
 		indicate the gray color.
 
@@ -3050,7 +3062,7 @@ Valid values are:
 		Where RED, GREEN and BLUE are reals between 0.0 (no color) and
 		1.0 (full color).
 
-Any other value is ignored and white will be used.
+Any other value is ignored and white color will be used.
 
 It's used only when `ps-print-color-p' is non-nil.
 
@@ -3058,6 +3070,7 @@ See also `ps-use-face-background'."
   :type '(choice :menu-tag "Default Background Gray/Color"
 		 :tag "Default Background Gray/Color"
 		 (const :tag "Session Background" t)
+		 (const :tag "Frame Background" frame-parameter)
 		 (number :tag "Gray Scale" :value 1.0)
 		 (string :tag "Color Name" :value "white")
 		 (list :tag "RGB Color" :value (1.0 1.0 1.0)
@@ -5895,14 +5908,22 @@ XSTART YSTART are the relative position for the first page in a sheet.")
 	       "[\000-\037\177]")
 	      (t "[\t\n\f]"))
 	ps-default-background (ps-rgb-color
-			       (if (eq ps-default-bg t)
-				   (ps-face-background-name 'default)
-				 ps-default-bg)
+			       (cond
+				((eq ps-default-bg 'frame-parameter)
+				 (ps-frame-parameter 'background-color))
+				((eq ps-default-bg t)
+				 (ps-face-background-name 'default))
+				(t
+				 ps-default-bg))
 			       1.0)
 	ps-default-foreground (ps-rgb-color
-			       (if (eq ps-default-fg t)
-				   (ps-face-foreground-name 'default)
-				 ps-default-fg)
+			       (cond
+				((eq ps-default-fg 'frame-parameter)
+				 (ps-frame-parameter 'foreground-color))
+				((eq ps-default-fg t)
+				 (ps-face-foreground-name 'default))
+				(t
+				 ps-default-fg))
 			       0.0)
 	ps-default-color (and (eq ps-print-color-p t) ps-default-foreground)
 	ps-current-color ps-default-color
@@ -6743,6 +6764,8 @@ If FACE is not a valid face name, it is used default face."
 				    (and (stringp ps-printer-name-option)
 					 ps-printer-name-option)
 				    ps-printer-name))))))
+	  (or (stringp ps-printer-name)
+	      (setq ps-printer-name nil))
 	  (apply (or ps-print-region-function 'call-process-region)
 		 (point-min) (point-max) ps-lpr-command nil
 		 (and (fboundp 'start-process) 0)
diff --git a/lisp/recentf.el b/lisp/recentf.el
index ca288100b98..12e4dd7ec57 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -1,7 +1,7 @@
 ;;; recentf.el --- setup a menu of recently opened files
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Created: July 19 1999
diff --git a/lisp/rect.el b/lisp/rect.el
index 9515733ef2b..5910c69bab9 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -1,7 +1,7 @@
 ;;; rect.el --- rectangle functions for GNU Emacs
 
 ;; Copyright (C) 1985, 1999, 2000, 2001, 2002, 2003, 2004
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Didier Verna <didier@xemacs.org>
 ;; Keywords: internal
diff --git a/lisp/register.el b/lisp/register.el
index 8940a887532..8f8b786cb9e 100644
--- a/lisp/register.el
+++ b/lisp/register.el
@@ -1,7 +1,7 @@
 ;;; register.el --- register commands for Emacs
 
 ;; Copyright (C) 1985, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 51e9d160a4e..46099b664d9 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -1,7 +1,7 @@
 ;;; repeat.el --- convenient way to repeat the previous command
 
 ;; Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Will Mengarini <seldon@eskimo.com>
 ;; Created: Mo 02 Mar 98
diff --git a/lisp/replace.el b/lisp/replace.el
index c51985c3e4a..12a99d72b9b 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -1,7 +1,7 @@
 ;;; replace.el --- replace commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1992, 1994, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
@@ -1406,6 +1406,8 @@ make, or the user didn't cancel the call."
 	(search-string from-string)
 	(real-match-data nil)		; the match data for the current match
 	(next-replacement nil)
+	;; This is non-nil if we know there is nothing for the user
+	;; to edit in the replacement.
 	(noedit nil)
 	(keep-going t)
 	(stack nil)
@@ -1517,8 +1519,7 @@ make, or the user didn't cancel the call."
 	      (set-match-data real-match-data)
 	      (setq next-replacement
 		    (funcall (car replacements) (cdr replacements)
-			     replace-count)
-		    noedit nil))
+			     replace-count)))
 	    (if (not query-flag)
 		(let ((inhibit-read-only
 		       query-replace-skip-read-only))
diff --git a/lisp/reposition.el b/lisp/reposition.el
index 08af0dc2f20..3fa4445f73c 100644
--- a/lisp/reposition.el
+++ b/lisp/reposition.el
@@ -1,7 +1,7 @@
 ;;; reposition.el --- center a Lisp function or comment on the screen
 
 ;; Copyright (C) 1991, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Michael D. Ernst <mernst@theory.lcs.mit.edu>
 ;; Created: Jan 1991
diff --git a/lisp/resume.el b/lisp/resume.el
index 48cf9562b9f..bb92ced271c 100644
--- a/lisp/resume.el
+++ b/lisp/resume.el
@@ -1,7 +1,7 @@
 ;;; resume.el --- process command line args from within a suspended Emacs job
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Joe Wells <jbw@bucsf.bu.edu>
 ;; Adapted-By: ESR
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 84411f98658..098033d9e59 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -1,7 +1,7 @@
 ;;; reveal.el --- Automatically reveal hidden text at point
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: outlines
diff --git a/lisp/rfn-eshadow.el b/lisp/rfn-eshadow.el
index 8e580039273..6798b0f8733 100644
--- a/lisp/rfn-eshadow.el
+++ b/lisp/rfn-eshadow.el
@@ -1,7 +1,7 @@
 ;;; rfn-eshadow.el --- Highlight `shadowed' part of read-file-name input text
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Miles Bader <miles@gnu.org>
 ;; Keywords: convenience minibuffer
diff --git a/lisp/rot13.el b/lisp/rot13.el
index a6605722d8a..fbc5eceea24 100644
--- a/lisp/rot13.el
+++ b/lisp/rot13.el
@@ -1,7 +1,7 @@
 ;;; rot13.el --- display a buffer in ROT13
 
 ;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/ruler-mode.el b/lisp/ruler-mode.el
index 10d05da886e..b2c48349a05 100644
--- a/lisp/ruler-mode.el
+++ b/lisp/ruler-mode.el
@@ -1,7 +1,7 @@
 ;;; ruler-mode.el --- display a ruler in the header line
 
-;; Copyright (C) 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
@@ -631,7 +631,7 @@ Optional argument PROPS specifies other text properties to apply."
   (apply 'propertize " " 'display (list 'space :width width) props))
 
 (defun ruler-mode-ruler ()
-  "Compute and return an header line ruler."
+  "Compute and return a header line ruler."
   (let* ((w (window-width))
          (m (window-margins))
          (f (window-fringes))
diff --git a/lisp/s-region.el b/lisp/s-region.el
index fa01dd986a1..363f47eaa75 100644
--- a/lisp/s-region.el
+++ b/lisp/s-region.el
@@ -1,7 +1,7 @@
 ;;; s-region.el --- set region using shift key
 
 ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Keywords: terminals
diff --git a/lisp/savehist.el b/lisp/savehist.el
index 3a5c0ae0347..9555bce9bd4 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -1,6 +1,6 @@
 ;;; savehist.el --- Save minibuffer history.
 
-;; Copyright (C) 1997, 2005, 2006 Free Software Foundation
+;; Copyright (C) 1997, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Hrvoje Niksic <hniksic@xemacs.org>
 ;; Keywords: minibuffer
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index cfaf87852d4..08e79baaf9e 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -1,7 +1,7 @@
 ;;; saveplace.el --- automatically save place in files
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: FSF
diff --git a/lisp/sb-image.el b/lisp/sb-image.el
index ac124fbc26b..d7d435642d8 100644
--- a/lisp/sb-image.el
+++ b/lisp/sb-image.el
@@ -1,7 +1,7 @@
 ;;; sb-image --- Image management for speedbar
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
diff --git a/lisp/scroll-all.el b/lisp/scroll-all.el
index 483de88fe39..b62246e3b3d 100644
--- a/lisp/scroll-all.el
+++ b/lisp/scroll-all.el
@@ -1,7 +1,7 @@
 ;;; scroll-all.el --- scroll all buffers together minor mode
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
 ;; Keywords: scroll crisp brief lock
diff --git a/lisp/scroll-bar.el b/lisp/scroll-bar.el
index d82ac0659f0..3c2b4df08bd 100644
--- a/lisp/scroll-bar.el
+++ b/lisp/scroll-bar.el
@@ -1,7 +1,7 @@
 ;;; scroll-bar.el --- window system-independent scroll bar support
 
 ;; Copyright (C) 1993, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: hardware
diff --git a/lisp/scroll-lock.el b/lisp/scroll-lock.el
index 8eb3977752f..7075377d1b0 100644
--- a/lisp/scroll-lock.el
+++ b/lisp/scroll-lock.el
@@ -1,6 +1,6 @@
 ;;; scroll-lock.el --- Scroll lock scrolling.
 
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ralf Angeli <angeli@iwi.uni-sb.de>
 ;; Maintainer: FSF
diff --git a/lisp/select.el b/lisp/select.el
index 642d91969a6..d96038bd256 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -4,7 +4,7 @@
 ;; Keywords: internal
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;; Based partially on earlier release by Lucid.
 
 ;; This file is part of GNU Emacs.
diff --git a/lisp/semantic.cache b/lisp/semantic.cache
new file mode 100644
index 00000000000..4b3d3e8002a
--- /dev/null
+++ b/lisp/semantic.cache
@@ -0,0 +1,15 @@
+;; Object lisp/
+;; SEMANTICDB Tags save file
+(semanticdb-project-database-file "lisp/"
+  :tables (list 
+   (semanticdb-table "server.el"
+    :major-mode 'emacs-lisp-mode
+    :tags '(("cl" include nil nil [3413 3426]) ("defgroup" code nil nil [3429 3508]) ("server-use-tcp" variable nil nil [3510 3951]) ("server-host" variable nil nil [3953 4256]) ("put" code nil nil [4257 4299]) ("server-auth-dir" variable (:default-value "~/.emacs.d/server/") nil [4301 4450]) ("put" code nil nil [4451 4497]) ("server-raise-frame" variable (:default-value t) nil [4499 4639]) ("server-visit-hook" variable nil nil [4641 4761]) ("server-switch-hook" variable nil nil [4763 4890]) ("server-done-hook" variable nil nil [4892 5017]) ("server-process" variable nil nil [5019 5078]) ("server-clients" variable nil nil [5080 5272]) ("server-buffer-clients" variable nil nil [5274 5375]) ("make-variable-buffer-local" code nil nil [5376 5427]) ("put" code nil nil [5481 5528]) ("server-window" variable nil nil [5530 6224]) ("server-temp-file-regexp" variable (:default-value "^/tmp/Re\\|/draft$") nil [6226 6452]) ("server-kill-new-buffers" variable (:default-value t) nil [6454 6901]) ("or" code nil nil [6903 7017]) ("server-existing-buffer" variable nil nil [7019 7235]) ("make-variable-buffer-local" code nil nil [7236 7288]) ("server-name" variable (:default-value "server") nil [7290 7319]) ("server-socket-dir" variable nil nil [7321 7437]) ("server-client" function (:arguments ("proc")) nil [7439 7690]) ("server-client-get" function (:arguments ("client" "property")) nil [7692 7988]) ("server-client-set" function (:arguments ("client" "property" "value")) nil [7990 8541]) ("server-clients-with" function (:arguments ("property" "value")) nil [8543 8810]) ("server-add-client" function (:arguments ("proc")) nil [8812 9052]) ("server-getenv-from" function (:arguments ("env" "variable")) nil [9054 9641]) ("server-with-environment" function (:arguments ("env" "vars" "&rest" "body")) nil [9643 10396]) ("server-delete-client" function (:arguments ("client" "&optional" "noframe")) nil [10398 12285]) ("server-log" function (:arguments ("string" "&optional" "client")) nil [12287 12786]) ("server-sentinel" function (:arguments ("proc" "msg")) nil [12788 13625]) ("server-handle-delete-frame" function (:arguments ("frame")) nil [13627 14194]) ("server-handle-suspend-tty" function (:arguments ("terminal")) nil [14239 14656]) ("server-unquote-arg" function (:arguments ("arg")) nil [14658 14913]) ("server-send-string" function (:arguments ("proc" "string")) nil [15303 15476]) ("server-ensure-safe-dir" function (:arguments ("dir")) nil [15478 16195]) ("server-start" function (:user-visible-flag t :arguments ("&optional" "leave-dead")) nil [16212 19581]) ("define-minor-mode" code nil nil [19598 20058]) ("server-process-filter" function (:arguments ("proc" "string")) nil [20061 34873]) ("server-goto-line-column" function (:arguments ("file-line-col")) nil [34875 35214]) ("server-visit-files" function (:arguments ("files" "client" "&optional" "nowait")) nil [35216 37216]) ("server-buffer-done" function (:arguments ("buffer" "&optional" "for-killing")) nil [37219 39280]) ("server-temp-file-p" function (:arguments ("&optional" "buffer")) nil [39282 39694]) ("server-done" function nil nil [39696 40513]) ("server-kill-buffer-query-function" function nil nil [40715 41129]) ("server-kill-emacs-query-function" function nil nil [41131 41503]) ("server-kill-buffer-running" variable nil nil [41505 41619]) ("server-kill-buffer" function nil nil [41621 42031]) ("server-edit" function (:user-visible-flag t :arguments ("&optional" "arg")) nil [42034 43127]) ("server-switch-buffer" function (:arguments ("&optional" "next-buffer" "killed-one")) nil [43129 45832]) ("server-save-buffers-kill-terminal" function (:arguments ("proc" "&optional" "arg")) nil [45849 46512]) ("define-key" code nil nil [46514 46553]) ("server-unload-hook" function nil nil [46555 46980]) ("add-hook" code nil nil [46982 47038]) ("add-hook" code nil nil [47059 47109]) ("server" package nil nil [47112 47129]))
+    :file "server.el"
+    :pointmax 47205
+    )
+   )
+  :file "semantic.cache"
+  :semantic-tag-version "2.0pre3"
+  :semanticdb-version "2.0pre3"
+  )
diff --git a/lisp/server.el b/lisp/server.el
index dd64bb6cf89..e0465324e05 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -448,8 +448,8 @@ client \"editors\" can send your editing commands to this Emacs
 job.  To use the server, set up the program `emacsclient' in the
 Emacs distribution as your standard \"editor\".
 
-Prefix arg LEAVE-DEAD means just kill any existing server
-communications subprocess."
+Optional argument LEAVE-DEAD (interactively, a prefix arg) means just
+kill any existing server communications subprocess."
   (interactive "P")
   (when (or
 	 (not server-clients)
diff --git a/lisp/ses.el b/lisp/ses.el
index fc75d74843c..ab92434bedb 100644
--- a/lisp/ses.el
+++ b/lisp/ses.el
@@ -1,6 +1,6 @@
 ;;; ses.el -- Simple Emacs Spreadsheet  -*- coding: utf-8 -*-
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Jonathan Yavner <jyavner@member.fsf.org>
 ;; Maintainer: Jonathan Yavner <jyavner@member.fsf.org>
diff --git a/lisp/shadowfile.el b/lisp/shadowfile.el
index ac2ab0fd0f8..af7356db71f 100644
--- a/lisp/shadowfile.el
+++ b/lisp/shadowfile.el
@@ -1,7 +1,7 @@
 ;;; shadowfile.el --- automatic file copying
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: comm files
diff --git a/lisp/shell.el b/lisp/shell.el
index 27220b54ab0..008cd93c47b 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -1,7 +1,7 @@
 ;;; shell.el --- specialized comint.el for running the shell
 
 ;; Copyright (C) 1988, 1993, 1994, 1995, 1996, 1997, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Olin Shivers <shivers@cs.cmu.edu>
 ;;	Simon Marshall <simon@gnu.org>
diff --git a/lisp/simple.el b/lisp/simple.el
index 38302f32233..28caa0c4f0b 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -1,7 +1,7 @@
 ;;; simple.el --- basic editing commands for Emacs
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1067,7 +1067,7 @@ this command arranges for all errors to enter the debugger."
     (if eval-expression-insert-value
 	(with-no-warnings
 	 (let ((standard-output (current-buffer)))
-	   (eval-last-sexp-print-value (car values))))
+	   (prin1 (car values))))
       (prog1
           (prin1 (car values) t)
         (let ((str (eval-expression-print-format (car values))))
diff --git a/lisp/skeleton.el b/lisp/skeleton.el
index d903dab461d..9e2dacd2201 100644
--- a/lisp/skeleton.el
+++ b/lisp/skeleton.el
@@ -1,7 +1,7 @@
 ;;; skeleton.el --- Lisp language extension for writing statement skeletons
 
 ;; Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Maintainer: FSF
diff --git a/lisp/smerge-mode.el b/lisp/smerge-mode.el
index 8d9df188875..bda569a1e05 100644
--- a/lisp/smerge-mode.el
+++ b/lisp/smerge-mode.el
@@ -1,7 +1,7 @@
 ;;; smerge-mode.el --- Minor mode to resolve diff3 conflicts
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Monnier <monnier@iro.umontreal.ca>
 ;; Keywords: tools revision-control merge diff3 cvs conflict
diff --git a/lisp/sort.el b/lisp/sort.el
index 7b90d3dcbdf..fb96a3ef1c9 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -1,7 +1,7 @@
 ;;; sort.el --- commands to sort text in an Emacs buffer
 
 ;; Copyright (C) 1986, 1987, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Howie Kaye
 ;; Maintainer: FSF
diff --git a/lisp/soundex.el b/lisp/soundex.el
index be73d71c21a..2133f1cf381 100644
--- a/lisp/soundex.el
+++ b/lisp/soundex.el
@@ -1,7 +1,7 @@
 ;;; soundex.el --- implement Soundex algorithm
 
 ;; Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Christian Plaunt <chris@bliss.berkeley.edu>
 ;; Maintainer: FSF
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 01357cb380a..711957d9cd0 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1,7 +1,7 @@
 ;;; speedbar --- quick access to files and tags in a frame
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric M. Ludlam <zappo@gnu.org>
 ;; Keywords: file, tags, tools
@@ -819,7 +819,7 @@ to toggle this value.")
 
 (defun speedbar-make-specialized-keymap ()
   "Create a keymap for use with a speedbar major or minor display mode.
-This basically creates a sparse keymap, and makes it's parent be
+This basically creates a sparse keymap, and makes its parent be
 `speedbar-key-map'."
   (let ((k (make-sparse-keymap)))
     (set-keymap-parent k speedbar-key-map)
diff --git a/lisp/startup.el b/lisp/startup.el
index 30d25900ad4..c19a997da82 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1,7 +1,7 @@
 ;;; startup.el --- process Emacs shell arguments
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
@@ -1133,6 +1133,11 @@ Copying Conditions\tConditions for redistributing and changing Emacs
 Getting New Versions\tHow to obtain the latest version of Emacs
 More Manuals / Ordering Manuals       Buying printed manuals from the FSF\n")
   (:face (variable-pitch :weight bold)
+	 "To quit a partially entered command, type "
+	 :face default
+	 "Control-g"
+	 :face variable-pitch
+	 "."
 	 "Useful File menu items:\n"
 	 :face variable-pitch
 	 "Exit Emacs\t\t(Or type "
@@ -1282,7 +1287,7 @@ using the mouse.\n\n")
 			 (emacs-version)
 			 "\n"
 			 :face '(variable-pitch :height 0.5)
-			 "Copyright (C) 2006 Free Software Foundation, Inc.")
+			 "Copyright (C) 2007 Free Software Foundation, Inc.")
     (and auto-save-list-file-prefix
 	 ;; Don't signal an error if the
 	 ;; directory for auto-save-list files
@@ -1533,6 +1538,7 @@ Warning Warning!!!  Pure space overflow    !!!Warning Warning
               (progn
                 (insert "\
 You can do basic editing with the menu bar and scroll bar using the mouse.
+To quit a partially entered command, type Control-g.
 
 Useful File menu items:
 Exit Emacs		(or type Control-x followed by Control-c)
@@ -1549,7 +1555,7 @@ More Manuals / Ordering Manuals    How to order printed manuals from the FSF
 ")
                 (insert "\n\n" (emacs-version)
                         "
-Copyright (C) 2006 Free Software Foundation, Inc."))
+Copyright (C) 2007 Free Software Foundation, Inc."))
 
 	    ;; No mouse menus, so give help using kbd commands.
 
@@ -1597,7 +1603,7 @@ If you have no Meta key, you may instead type ESC followed by the character.)")
 
 	    (insert "\n\n" (emacs-version)
 		    "
-Copyright (C) 2006 Free Software Foundation, Inc.")
+Copyright (C) 2007 Free Software Foundation, Inc.")
 
 	    (if (and (eq (key-binding "\C-h\C-c") 'describe-copying)
 		     (eq (key-binding "\C-h\C-d") 'describe-distribution)
diff --git a/lisp/strokes.el b/lisp/strokes.el
index c440f0df860..5886f3d1810 100644
--- a/lisp/strokes.el
+++ b/lisp/strokes.el
@@ -1,7 +1,7 @@
 ;;; strokes.el --- control Emacs through mouse strokes
 
 ;; Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Bakhash <cadet@alum.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/subr.el b/lisp/subr.el
index 18f4ad65686..c91c9c599b7 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1,7 +1,7 @@
 ;;; subr.el --- basic lisp subroutines for Emacs
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/t-mouse.el b/lisp/t-mouse.el
index 1a4ca969954..96e545aa11c 100644
--- a/lisp/t-mouse.el
+++ b/lisp/t-mouse.el
@@ -4,10 +4,7 @@
 ;; Maintainer: Nick Roberts <nickrob@gnu.org>
 ;; Keywords: mouse gpm linux
 
-;; Copyright (C) 1994,1995 Alessandro Rubini <rubini@linux.it>
-;;               parts are by Ian T Zimmermann <itz@rahul.net>, 1995,1998
-;; Copyright (C) 2006
-;; Free Software Foundation, Inc.
+;; Copyright (C) 1994, 1995, 1998, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/tabify.el b/lisp/tabify.el
index 42d8e15f1ab..d0d65efcf9c 100644
--- a/lisp/tabify.el
+++ b/lisp/tabify.el
@@ -1,7 +1,7 @@
 ;;; tabify.el --- tab conversion commands for Emacs
 
 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/talk.el b/lisp/talk.el
index f107086046d..9197460c295 100644
--- a/lisp/talk.el
+++ b/lisp/talk.el
@@ -1,7 +1,7 @@
 ;;; talk.el --- allow several users to talk to each other through Emacs
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: comm, frames
diff --git a/lisp/tar-mode.el b/lisp/tar-mode.el
index b1f0176b0f3..cffc8a4cccc 100644
--- a/lisp/tar-mode.el
+++ b/lisp/tar-mode.el
@@ -1,7 +1,7 @@
 ;;; tar-mode.el --- simple editing of tar files from GNU emacs
 
 ;; Copyright (C) 1990, 1991, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jamie Zawinski <jwz@lucid.com>
 ;; Maintainer: FSF
diff --git a/lisp/tempo.el b/lisp/tempo.el
index 14fdb4c969e..64427d8ccf4 100644
--- a/lisp/tempo.el
+++ b/lisp/tempo.el
@@ -1,7 +1,7 @@
 ;;; tempo.el --- Flexible template insertion
 
 ;; Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David K}gedal <davidk@lysator.liu.se>
 ;; Created: 16 Feb 1994
diff --git a/lisp/term.el b/lisp/term.el
index 1e97a4eebcd..a853c12ec39 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -1,7 +1,7 @@
 ;;; term.el --- general command interpreter in a window stuff
 
 ;; Copyright (C) 1988, 1990, 1992, 1994, 1995, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Bothner <per@bothner.com>
 ;; Maintainer: Dan Nicolaescu <dann@ics.uci.edu>, Per Bothner <per@bothner.com>
diff --git a/lisp/term/AT386.el b/lisp/term/AT386.el
index 702a4b614e2..67808089e11 100644
--- a/lisp/term/AT386.el
+++ b/lisp/term/AT386.el
@@ -1,7 +1,7 @@
 ;;; AT386.el --- terminal support package for IBM AT keyboards -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eric S. Raymond <esr@snark.thyrsus.com>
 ;; Keywords: terminals
diff --git a/lisp/term/internal.el b/lisp/term/internal.el
index 0cbb3ae10f6..e9afd6b9462 100644
--- a/lisp/term/internal.el
+++ b/lisp/term/internal.el
@@ -1,7 +1,7 @@
 ;;; internal.el --- support for PC internal terminal -*- coding: raw-text; no-byte-compile: t -*-
 
 ;; Copyright (C) 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 
diff --git a/lisp/term/iris-ansi.el b/lisp/term/iris-ansi.el
index 56a387b1848..e45cf1384c9 100644
--- a/lisp/term/iris-ansi.el
+++ b/lisp/term/iris-ansi.el
@@ -1,7 +1,7 @@
 ;;; iris-ansi.el --- configure Emacs for SGI xwsh and winterm apps -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dan Nicolaescu <dann@ics.uci.edu>
 
diff --git a/lisp/term/mac-win.el b/lisp/term/mac-win.el
index 700ad57029b..7e3d7b14ddd 100644
--- a/lisp/term/mac-win.el
+++ b/lisp/term/mac-win.el
@@ -1,7 +1,7 @@
 ;;; mac-win.el --- parse switches controlling interface with Mac window system -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Andrew Choi <akochoi@mac.com>
 ;; Keywords: terminals
@@ -1687,6 +1687,26 @@ in `selection-converter-alist', which see."
 				       (+ (* i 10) 12)))))
     result))
 
+(defconst mac-keyboard-modifier-mask-alist
+  (mapcar
+   (lambda (modifier-bit)
+     (cons (car modifier-bit) (lsh 1 (cdr modifier-bit))))
+   '((command  . 8)			; cmdKeyBit
+     (shift    . 9)			; shiftKeyBit
+     (option   . 11)			; optionKeyBit
+     (control  . 12)			; controlKeyBit
+     (function . 17)))			; kEventKeyModifierFnBit
+  "Alist of Mac keyboard modifier symbols vs masks.")
+
+(defun mac-ae-keyboard-modifiers (ae)
+  (let ((modifiers-value (mac-ae-number ae "kmod"))
+	modifiers)
+    (if modifiers-value
+	(dolist (modifier-mask mac-keyboard-modifier-mask-alist)
+	  (if (/= (logand modifiers-value (cdr modifier-mask)) 0)
+	      (setq modifiers (cons (car modifier-mask) modifiers)))))
+    modifiers))
+
 (defun mac-ae-open-documents (event)
   "Open the documents specified by the Apple event EVENT."
   (interactive "e")
@@ -1714,6 +1734,15 @@ in `selection-converter-alist', which see."
 	      nil t)))))
   (select-frame-set-input-focus (selected-frame)))
 
+(defun mac-ae-quit-application (event)
+  "Quit the application Emacs with the Apple event EVENT."
+  (interactive "e")
+  (let ((ae (mac-event-ae event)))
+    (unwind-protect
+	(save-buffers-kill-emacs)
+      ;; Reaches here if the user has canceled the quit.
+      (mac-resume-apple-event ae -128)))) ; userCanceledErr
+
 (defun mac-ae-get-url (event)
   "Open the URL specified by the Apple event EVENT.
 Currently the `mailto' scheme is supported."
@@ -1740,7 +1769,7 @@ Currently the `mailto' scheme is supported."
   'mac-ae-open-documents)
 (define-key mac-apple-event-map [core-event show-preferences] 'customize)
 (define-key mac-apple-event-map [core-event quit-application]
-  'save-buffers-kill-emacs)
+  'mac-ae-quit-application)
 
 (define-key mac-apple-event-map [internet-event get-url] 'mac-ae-get-url)
 
@@ -1753,9 +1782,8 @@ With no keyboard modifiers, it toggles the visibility of the
 frame where the tool-bar toggle button was pressed.  With some
 modifiers, it changes global tool-bar visibility setting."
   (interactive "e")
-  (let* ((ae (mac-event-ae event))
-	 (modifiers (cdr (mac-ae-parameter ae "kmod"))))
-    (if (and modifiers (not (string= modifiers "\000\000\000\000")))
+  (let ((ae (mac-event-ae event)))
+    (if (mac-ae-keyboard-modifiers ae)
 	;; Globally toggle tool-bar-mode if some modifier key is pressed.
 	(tool-bar-mode)
       (let ((frame (mac-ae-frame ae)))
@@ -2212,10 +2240,10 @@ See also `mac-dnd-known-types'."
 (defun mac-dnd-insert-TIFF (window action data)
   (dnd-insert-text window action (mac-TIFF-to-string data)))
 
-(defun mac-dnd-drop-data (event frame window data type)
+(defun mac-dnd-drop-data (event frame window data type &optional action)
+  (or action (setq action 'private))
   (let* ((type-info (assoc type mac-dnd-types-alist))
 	 (handler (cdr type-info))
-	 (action 'private)
 	 (w (posn-window (event-start event))))
     (when handler
       (if (and (windowp w) (window-live-p w)
@@ -2236,12 +2264,16 @@ See also `mac-dnd-known-types'."
 (defun mac-dnd-handle-drag-n-drop-event (event)
   "Receive drag and drop events."
   (interactive "e")
-  (let ((window (posn-window (event-start event))))
+  (let ((window (posn-window (event-start event)))
+	(ae (mac-event-ae event))
+	action)
     (when (windowp window) (select-window window))
-    (dolist (item (mac-ae-list (mac-event-ae event)))
+    (if (memq 'option (mac-ae-keyboard-modifiers ae))
+	(setq action 'copy))
+    (dolist (item (mac-ae-list ae))
       (if (not (equal (car item) "null"))
 	  (mac-dnd-drop-data event (selected-frame) window
-			     (cdr item) (car item)))))
+			     (cdr item) (car item) action))))
   (select-frame-set-input-focus (selected-frame)))
 
 ;;; Do the actual Windows setup here; the above code just defines
@@ -2582,7 +2614,6 @@ ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 ;; Initiate drag and drop
 
 (define-key special-event-map [drag-n-drop] 'mac-dnd-handle-drag-n-drop-event)
-(define-key special-event-map [M-drag-n-drop] 'mac-dnd-handle-drag-n-drop-event)
 
 
 ;;;; Non-toolkit Scroll bars
diff --git a/lisp/term/news.el b/lisp/term/news.el
index d39c79838f6..e88af7882a7 100644
--- a/lisp/term/news.el
+++ b/lisp/term/news.el
@@ -1,7 +1,7 @@
 ;;; news.el --- keypad and function key bindings for the Sony NEWS keyboard -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index fd63e5a1db9..7a737715cd8 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -1,7 +1,7 @@
 ;;; pc-win.el --- setup support for `PC windows' (whatever that is)
 
 ;; Copyright (C) 1994, 1996, 1997, 1999, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainer: FSF
diff --git a/lisp/term/rxvt.el b/lisp/term/rxvt.el
index cd8160c507c..d9c87bba7fe 100644
--- a/lisp/term/rxvt.el
+++ b/lisp/term/rxvt.el
@@ -1,6 +1,6 @@
 ;;; rxvt.el --- define function key sequences and standard colors for rxvt
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Keywords: terminals
diff --git a/lisp/term/sun-mouse.el b/lisp/term/sun-mouse.el
index 76b2ef6d3d9..dcc56d503e9 100644
--- a/lisp/term/sun-mouse.el
+++ b/lisp/term/sun-mouse.el
@@ -1,7 +1,7 @@
 ;;; sun-mouse.el --- mouse handling for Sun windows
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck
 ;; Maintainer: FSF
diff --git a/lisp/term/sun.el b/lisp/term/sun.el
index 8913fa98268..b17b9125d8e 100644
--- a/lisp/term/sun.el
+++ b/lisp/term/sun.el
@@ -1,7 +1,7 @@
 ;;; sun.el --- keybinding for standard default sunterm keys
 
 ;; Copyright (C) 1987, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jeff Peck <peck@sun.com>
 ;; Keywords: terminals
diff --git a/lisp/term/sup-mouse.el b/lisp/term/sup-mouse.el
index a038fbd3d9d..52528cb8aa9 100644
--- a/lisp/term/sup-mouse.el
+++ b/lisp/term/sup-mouse.el
@@ -1,7 +1,7 @@
 ;;; sup-mouse.el --- supdup mouse support for lisp machines
 
 ;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Wolfgang Rupprecht
 ;; Maintainer: FSF
diff --git a/lisp/term/tty-colors.el b/lisp/term/tty-colors.el
index c03aebf4068..6dcd63eb945 100644
--- a/lisp/term/tty-colors.el
+++ b/lisp/term/tty-colors.el
@@ -1,7 +1,7 @@
 ;;; tty-colors.el --- color support for character terminals
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Eli Zaretskii
 ;; Maintainer: FSF
diff --git a/lisp/term/tvi970.el b/lisp/term/tvi970.el
index 083c99f6241..cb309740155 100644
--- a/lisp/term/tvi970.el
+++ b/lisp/term/tvi970.el
@@ -1,7 +1,7 @@
 ;;; tvi970.el --- terminal support for the Televideo 970
 
 ;; Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jim Blandy <jimb@occs.cs.oberlin.edu>, January 1992
 ;; Keywords: terminals
diff --git a/lisp/term/vt100.el b/lisp/term/vt100.el
index 38509a471cd..0c4fcc70768 100644
--- a/lisp/term/vt100.el
+++ b/lisp/term/vt100.el
@@ -1,7 +1,7 @@
 ;;; vt100.el --- define VT100 function key sequences in function-key-map
 
 ;; Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index 5ba5b270327..56dbf944dfe 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,7 +1,7 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
diff --git a/lisp/term/wyse50.el b/lisp/term/wyse50.el
index 6723ee8a07c..79d73504a08 100644
--- a/lisp/term/wyse50.el
+++ b/lisp/term/wyse50.el
@@ -1,7 +1,7 @@
 ;;; wyse50.el --- terminal support code for Wyse 50 -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1989, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>,
 ;;	Jim Blandy <jimb@occs.cs.oberlin.edu>
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index 32959f38e34..d2978147ad1 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1,7 +1,7 @@
 ;;; x-win.el --- parse relevant switches and set up for X  -*-coding: iso-2022-7bit;-*-
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals, i18n
diff --git a/lisp/term/xterm.el b/lisp/term/xterm.el
index f72c4d205d1..9ac820dda72 100644
--- a/lisp/term/xterm.el
+++ b/lisp/term/xterm.el
@@ -1,7 +1,7 @@
 ;;; xterm.el --- define function key sequences and standard colors for xterm
 
 ;; Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: FSF
 ;; Keywords: terminals
diff --git a/lisp/terminal.el b/lisp/terminal.el
index b26a2643d75..cf31afd09a7 100644
--- a/lisp/terminal.el
+++ b/lisp/terminal.el
@@ -1,7 +1,7 @@
 ;;; terminal.el --- terminal emulator for GNU Emacs
 
 ;; Copyright (C) 1986, 1987, 1988, 1989, 1993, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Richard Mlynarik <mly@eddie.mit.edu>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/artist.el b/lisp/textmodes/artist.el
index d5dcdd0d9ef..37c449a75ea 100644
--- a/lisp/textmodes/artist.el
+++ b/lisp/textmodes/artist.el
@@ -1,7 +1,7 @@
 ;;; artist.el --- draw ascii graphics with your mouse
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:       Tomas Abrahamsson <tab@lysator.liu.se>
 ;; Maintainer:   Tomas Abrahamsson <tab@lysator.liu.se>
diff --git a/lisp/textmodes/bib-mode.el b/lisp/textmodes/bib-mode.el
index 856fe735f8e..121137c7025 100644
--- a/lisp/textmodes/bib-mode.el
+++ b/lisp/textmodes/bib-mode.el
@@ -1,7 +1,7 @@
 ;;; bib-mode.el --- major mode for editing bib files
 
 ;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: bib
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el
index 5cc22443219..06fa3a01186 100644
--- a/lisp/textmodes/bibtex.el
+++ b/lisp/textmodes/bibtex.el
@@ -1,7 +1,7 @@
 ;;; bibtex.el --- BibTeX mode for GNU Emacs
 
 ;; Copyright (C) 1992, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Stefan Schoef <schoef@offis.uni-oldenburg.de>
 ;;      Bengt Martensson <bengt@mathematik.uni-Bremen.de>
@@ -530,7 +530,8 @@ directories specified in `bibtex-file-path'.  If an element is a directory,
 check all BibTeX files in this directory.  If an element is the symbol
 `bibtex-file-path', check all BibTeX files in `bibtex-file-path'."
   :group 'bibtex
-  :type '(repeat file))
+  :type '(repeat (choice (const :tag "bibtex-file-path" bibtex-file-path)
+                         directory file)))
 
 (defvar bibtex-file-path (getenv "BIBINPUTS")
   "*Colon separated list of paths to search for `bibtex-files'.")
diff --git a/lisp/textmodes/conf-mode.el b/lisp/textmodes/conf-mode.el
index f7a725242ed..e5ea2d1fbe9 100644
--- a/lisp/textmodes/conf-mode.el
+++ b/lisp/textmodes/conf-mode.el
@@ -1,6 +1,6 @@
 ;;; conf-mode.el --- Simple major mode for editing conf/ini/properties files
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Keywords: conf ini windows java
diff --git a/lisp/textmodes/dns-mode.el b/lisp/textmodes/dns-mode.el
index 21fe137118f..6e197578ffc 100644
--- a/lisp/textmodes/dns-mode.el
+++ b/lisp/textmodes/dns-mode.el
@@ -1,6 +1,6 @@
 ;;; dns-mode.el --- a mode for viewing/editing Domain Name System master files
 
-;; Copyright (C) 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <simon@josefsson.org>
 ;; Keywords: DNS master zone file SOA
diff --git a/lisp/textmodes/enriched.el b/lisp/textmodes/enriched.el
index 841a5bb0830..0e2acc8f74b 100644
--- a/lisp/textmodes/enriched.el
+++ b/lisp/textmodes/enriched.el
@@ -1,7 +1,7 @@
 ;;; enriched.el --- read and save files in text/enriched format
 
 ;; Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Boris Goldowsky <boris@gnu.org>
 ;; Keywords: wp, faces
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index 65c8067d48a..7318a52d8a9 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -1,7 +1,7 @@
 ;;; fill.el --- fill commands for Emacs		-*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1985, 1986, 1992, 1994, 1995, 1996, 1997, 1999, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
@@ -52,7 +52,8 @@ A value of nil means that any change in indentation starts a new paragraph."
 
 (defvar fill-paragraph-function nil
   "Mode-specific function to fill a paragraph, or nil if there is none.
-If the function returns nil, then `fill-paragraph' does its normal work.")
+If the function returns nil, then `fill-paragraph' does its normal work.
+A value of t means explicitly \"do nothing special\".")
 
 (defvar fill-paragraph-handle-comment t
   "Non-nil means paragraph filling will try to pay attention to comments.")
@@ -761,7 +762,8 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
 		 (barf-if-buffer-read-only)
 		 (list (if current-prefix-arg 'full))))
   ;; First try fill-paragraph-function.
-  (or (and (or fill-paragraph-function
+  (or (and (not (eq fill-paragraph-function t))
+	   (or fill-paragraph-function
 	       (and (minibufferp (current-buffer))
 		    (= 1 (point-min))))
 	   (let ((function (or fill-paragraph-function
@@ -773,7 +775,7 @@ If `fill-paragraph-function' is nil, return the `fill-prefix' used for filling."
 		 ;; fill-paragraph-handle-comment back to t explicitly or
 		 ;; return nil.
 		 (fill-paragraph-handle-comment nil)
-		 fill-paragraph-function)
+		 (fill-paragraph-function t))
 	     (funcall function arg)))
       ;; Then try our syntax-aware filling code.
       (and fill-paragraph-handle-comment
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 7badf21d966..a6bd082af38 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1,7 +1,7 @@
 ;;; flyspell.el --- on-the-fly spell checker
 
 ;; Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Manuel Serrano <Manuel.Serrano@sophia.inria.fr>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 5bc685af65b..fe74bf8f321 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1,7 +1,7 @@
 ;;; ispell.el --- interface to International Ispell Versions 3.1 and 3.2
 
 ;; Copyright (C) 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:           Ken Stevens <k.stevens@ieee.org>
 ;; Maintainer:       Ken Stevens <k.stevens@ieee.org>
@@ -574,7 +574,7 @@ re-start Emacs."
     "[A-Za-z^\\]" "[^A-Za-z^\\]"
     "[-'`\"]" t ("-C" "-d" "esperanto") "~tex" iso-8859-3)
    ("francais7"
-    "[A-Za-z]" "[^A-Za-z]" "[`'^---]" t nil nil iso-8859-1)
+    "[A-Za-z]" "[^A-Za-z]" "[`'^-]" t nil nil iso-8859-1)
    ("francais"				; Francais.aff
     "[A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]"
     "[^A-Za-z\300\302\306\307\310\311\312\313\316\317\324\331\333\334\340\342\347\350\351\352\353\356\357\364\371\373\374]"
@@ -623,7 +623,7 @@ re-start Emacs."
    ("polish"				; Polish mode
     "[A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
     "[^A-Za-z\241\243\246\254\257\261\263\266\274\277\306\312\321\323\346\352\361\363]"
-    "." nil nil nil iso-8859-2)
+    "[.]" nil nil nil iso-8859-2)
    ("portugues"				; Portuguese mode
     "[a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]"
     "[^a-zA-Z\301\302\311\323\340\341\342\351\352\355\363\343\372]"
@@ -2607,6 +2607,7 @@ By just answering RET you can find out what the current dictionary is."
 	       (mapcar 'list (ispell-valid-dictionary-list)))
 	  nil t)
 	 current-prefix-arg))
+  (ispell-maybe-find-aspell-dictionaries)
   (unless arg (ispell-buffer-local-dict 'no-reload))
   (if (equal dict "default") (setq dict nil))
   ;; This relies on completing-read's bug of returning "" for no match
diff --git a/lisp/textmodes/makeinfo.el b/lisp/textmodes/makeinfo.el
index f521cc279d0..4bc27866a72 100644
--- a/lisp/textmodes/makeinfo.el
+++ b/lisp/textmodes/makeinfo.el
@@ -1,7 +1,7 @@
 ;;; makeinfo.el --- run makeinfo conveniently
 
 ;; Copyright (C) 1991, 1993, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/nroff-mode.el b/lisp/textmodes/nroff-mode.el
index 4a07b091e2a..ad0485fbb30 100644
--- a/lisp/textmodes/nroff-mode.el
+++ b/lisp/textmodes/nroff-mode.el
@@ -1,7 +1,7 @@
 ;;; nroff-mode.el --- GNU Emacs major mode for editing nroff source
 
 ;; Copyright (C) 1985, 1986, 1994, 1995, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/textmodes/org.el b/lisp/textmodes/org.el
index 4cd697af36d..1be73ec481c 100644
--- a/lisp/textmodes/org.el
+++ b/lisp/textmodes/org.el
@@ -1,6 +1,6 @@
 ;;; org.el --- Outline-based notes management and organize
 ;; Carstens outline-mode for keeping track of everything.
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Carsten Dominik <dominik at science dot uva dot nl>
 ;; Keywords: outlines, hypermedia, calendar, wp
diff --git a/lisp/textmodes/page-ext.el b/lisp/textmodes/page-ext.el
index 700a4388f57..5f98c43c639 100644
--- a/lisp/textmodes/page-ext.el
+++ b/lisp/textmodes/page-ext.el
@@ -1,7 +1,7 @@
 ;;; page-ext.el --- extended page handling commands
 
 ;; Copyright (C) 1990, 1991, 1993, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bob@gnu.org>
 ;; Keywords: wp data
diff --git a/lisp/textmodes/page.el b/lisp/textmodes/page.el
index f3abe36a26e..7b7fb474afc 100644
--- a/lisp/textmodes/page.el
+++ b/lisp/textmodes/page.el
@@ -1,7 +1,7 @@
 ;;; page.el --- page motion commands for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp convenience
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index aac4cee4dd7..10e35107b30 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -1,7 +1,7 @@
 ;;; paragraphs.el --- paragraph and sentence parsing
 
 ;; Copyright (C) 1985, 1986, 1987, 1991, 1994, 1995, 1996, 1997, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index ab070053e07..73ac80a3f37 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -1,7 +1,7 @@
 ;;; picture.el --- "Picture mode" -- editing using quarter-plane screen model
 
 ;; Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/po.el b/lisp/textmodes/po.el
index 701095caa8e..7c02a35b367 100644
--- a/lisp/textmodes/po.el
+++ b/lisp/textmodes/po.el
@@ -1,7 +1,7 @@
 ;;; po.el --- basic support of PO translation files -*- coding: latin-1; -*-
 
 ;; Copyright (C) 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Authors: François Pinard <pinard@iro.umontreal.ca>,
 ;;          Greg McGary <gkm@magilla.cichlid.com>,
diff --git a/lisp/textmodes/refbib.el b/lisp/textmodes/refbib.el
index f276fe26458..3ee94c38e34 100644
--- a/lisp/textmodes/refbib.el
+++ b/lisp/textmodes/refbib.el
@@ -1,7 +1,7 @@
 ;;; refbib.el --- convert refer-style references to ones usable by Latex bib
 
 ;; Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Henry Kautz <kautz@research.att.com>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/refer.el b/lisp/textmodes/refer.el
index 474b6f7be60..394c4964b44 100644
--- a/lisp/textmodes/refer.el
+++ b/lisp/textmodes/refer.el
@@ -1,7 +1,7 @@
 ;;; refer.el --- look up references in bibliography files
 
 ;; Copyright (C) 1992, 1996, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ashwin Ram <ashwin@cc.gatech.edu>
 ;; Maintainer: Gernot Heiser <gernot@acm.org>
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 69eb96491d1..b9fe20e7bba 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -1,7 +1,7 @@
 ;;; refill.el --- `auto-fill' by refilling paragraphs on changes
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Miles Bader <miles@gnu.org>
diff --git a/lisp/textmodes/reftex-auc.el b/lisp/textmodes/reftex-auc.el
index aa46553adbe..7930574f0e7 100644
--- a/lisp/textmodes/reftex-auc.el
+++ b/lisp/textmodes/reftex-auc.el
@@ -1,7 +1,7 @@
 ;;; reftex-auc.el --- RefTeX's interface to AUCTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 55d1e2f4614..ded1caa12bd 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -1,7 +1,7 @@
 ;;; reftex-cite.el --- creating citations with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-dcr.el b/lisp/textmodes/reftex-dcr.el
index bc5f7691bb7..bd0d75760b6 100644
--- a/lisp/textmodes/reftex-dcr.el
+++ b/lisp/textmodes/reftex-dcr.el
@@ -1,7 +1,7 @@
 ;;; reftex-dcr.el --- viewing cross references and citations with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-global.el b/lisp/textmodes/reftex-global.el
index b07627c2e95..403e4e84ea8 100644
--- a/lisp/textmodes/reftex-global.el
+++ b/lisp/textmodes/reftex-global.el
@@ -1,7 +1,7 @@
 ;;; reftex-global.el --- operations on entire documents with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index 15f70895ce3..25525fef6dd 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1,7 +1,7 @@
 ;;; reftex-index.el --- index support with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 89aef5bd971..8ee552b3226 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1,7 +1,7 @@
 ;;; reftex-parse.el --- parser functions for RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-ref.el b/lisp/textmodes/reftex-ref.el
index 3104152dab6..a0471f18b82 100644
--- a/lisp/textmodes/reftex-ref.el
+++ b/lisp/textmodes/reftex-ref.el
@@ -1,7 +1,7 @@
 ;;; reftex-ref.el --- code to create labels and references with RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index 1660fe70f40..9b9d60d1f62 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -1,7 +1,7 @@
 ;;; reftex-sel.el --- the selection modes for RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index 7508351fb35..84269dfc091 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -1,6 +1,6 @@
 ;;; reftex-toc.el --- RefTeX's table of contents mode
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex-vars.el b/lisp/textmodes/reftex-vars.el
index 852af59df45..40e73b49f3d 100644
--- a/lisp/textmodes/reftex-vars.el
+++ b/lisp/textmodes/reftex-vars.el
@@ -1,7 +1,7 @@
 ;;; reftex-vars.el --- configuration variables for RefTeX
 
 ;; Copyright (C) 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index d759aff8774..39141541d82 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1,6 +1,6 @@
 ;;; reftex.el --- minor mode for doing \label, \ref, \cite, \index in LaTeX
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <dominik@science.uva.nl>
 ;; Version: 4.31
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index aa24a724877..6757eb9be1c 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -1,7 +1,7 @@
 ;;; sgml-mode.el --- SGML- and HTML-editing modes -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1992, 1995, 1996, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: James Clark <jjc@jclark.com>
 ;; Maintainer: FSF
diff --git a/lisp/textmodes/spell.el b/lisp/textmodes/spell.el
index f68cc6b6010..5398779b17e 100644
--- a/lisp/textmodes/spell.el
+++ b/lisp/textmodes/spell.el
@@ -1,7 +1,7 @@
 ;;; spell.el --- spelling correction interface for Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp, unix
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index c712524396f..c0a85eeb68c 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -1,7 +1,7 @@
 ;;; table.el --- create and edit WYSIWYG text based embedded tables
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
diff --git a/lisp/textmodes/tex-mode.el b/lisp/textmodes/tex-mode.el
index 511721d7f67..b5ca77e5853 100644
--- a/lisp/textmodes/tex-mode.el
+++ b/lisp/textmodes/tex-mode.el
@@ -1,7 +1,7 @@
 ;;; tex-mode.el --- TeX, LaTeX, and SliTeX mode commands -*- coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1989, 1992, 1994, 1995, 1996, 1997, 1998, 1999,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: tex
diff --git a/lisp/textmodes/texinfmt.el b/lisp/textmodes/texinfmt.el
index 35ac181817a..577eb2e1938 100644
--- a/lisp/textmodes/texinfmt.el
+++ b/lisp/textmodes/texinfmt.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993,
 ;;   1994, 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: Robert J. Chassell <bug-texinfo@gnu.org>
 ;; Keywords: maint, tex, docs
diff --git a/lisp/textmodes/texinfo.el b/lisp/textmodes/texinfo.el
index 36603174948..a06ac1bfd52 100644
--- a/lisp/textmodes/texinfo.el
+++ b/lisp/textmodes/texinfo.el
@@ -1,7 +1,7 @@
 ;;; texinfo.el --- major mode for editing Texinfo files -*- coding: iso-2022-7bit -*-
 
 ;; Copyright (C) 1985, 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1997,
-;;   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Date:   [See date below for texinfo-version]
diff --git a/lisp/textmodes/texnfo-upd.el b/lisp/textmodes/texnfo-upd.el
index 29af72162d0..c5d125fdae5 100644
--- a/lisp/textmodes/texnfo-upd.el
+++ b/lisp/textmodes/texnfo-upd.el
@@ -1,7 +1,7 @@
 ;;; texnfo-upd.el --- utilities for updating nodes and menus in Texinfo files
 
 ;; Copyright (C) 1989, 1990, 1991, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Robert J. Chassell
 ;; Maintainer: bug-texinfo@gnu.org
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 873635a3893..8887edf1142 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -1,7 +1,7 @@
 ;;; text-mode.el --- text mode, and its idiosyncratic commands
 
 ;; Copyright (C) 1985, 1992, 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/textmodes/tildify.el b/lisp/textmodes/tildify.el
index 74b2db3ad34..9e282792dd5 100644
--- a/lisp/textmodes/tildify.el
+++ b/lisp/textmodes/tildify.el
@@ -1,7 +1,7 @@
 ;;; tildify.el --- adding hard spaces into texts
 
 ;; Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     Milan Zamazal <pdm@zamazal.org>
 ;; Version:    4.5
diff --git a/lisp/textmodes/two-column.el b/lisp/textmodes/two-column.el
index 9de1a078d13..cf43aff4795 100644
--- a/lisp/textmodes/two-column.el
+++ b/lisp/textmodes/two-column.el
@@ -1,7 +1,7 @@
 ;;; two-column.el --- minor mode for editing of two-column text
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Daniel Pfeiffer <occitan@esperanto.org>
 ;; Adapted-By: ESR, Daniel Pfeiffer
diff --git a/lisp/textmodes/underline.el b/lisp/textmodes/underline.el
index 4cea84c5a40..7b8f98f8685 100644
--- a/lisp/textmodes/underline.el
+++ b/lisp/textmodes/underline.el
@@ -1,7 +1,7 @@
 ;;; underline.el --- insert/remove underlining (done by overstriking) in Emacs
 
 ;; Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: wp
diff --git a/lisp/thingatpt.el b/lisp/thingatpt.el
index 8526cfb717b..fd387a22c0f 100644
--- a/lisp/thingatpt.el
+++ b/lisp/thingatpt.el
@@ -1,7 +1,7 @@
 ;;; thingatpt.el --- get the `thing' at point
 
 ;; Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mike Williams <mikew@gopher.dosli.govt.nz>
 ;; Maintainer: FSF
diff --git a/lisp/thumbs.el b/lisp/thumbs.el
index e9a640973bb..af17d925d35 100644
--- a/lisp/thumbs.el
+++ b/lisp/thumbs.el
@@ -1,6 +1,6 @@
 ;;; thumbs.el --- Thumbnails previewer for images files
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jean-Philippe Theberge <jphiltheberge@videotron.ca>
 ;; Maintainer: FSF
diff --git a/lisp/time-stamp.el b/lisp/time-stamp.el
index f29806e3013..973ff972af0 100644
--- a/lisp/time-stamp.el
+++ b/lisp/time-stamp.el
@@ -1,7 +1,7 @@
 ;;; time-stamp.el --- Maintain last change time stamps in files edited by Emacs
 
 ;; Copyright (C) 1989, 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/time.el b/lisp/time.el
index 74812bf9f94..b59ecbc3601 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -1,7 +1,7 @@
 ;;; time.el --- display time, load and mail indicator in mode line of Emacs -*-coding: utf-8 -*-
 
 ;; Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 
diff --git a/lisp/timezone.el b/lisp/timezone.el
index af30cf64988..005e1f928d0 100644
--- a/lisp/timezone.el
+++ b/lisp/timezone.el
@@ -1,7 +1,7 @@
 ;;; timezone.el --- time zone package for GNU Emacs
 
 ;; Copyright (C) 1990, 1991, 1992, 1993, 1996, 1999, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Masanobu Umeda
 ;; Maintainer: umerin@mse.kyutech.ac.jp
diff --git a/lisp/tmm.el b/lisp/tmm.el
index b5138fbef92..f9583e76cee 100644
--- a/lisp/tmm.el
+++ b/lisp/tmm.el
@@ -1,7 +1,7 @@
 ;;; tmm.el --- text mode access to menu-bar
 
 ;; Copyright (C) 1994, 1995, 1996, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Ilya Zakharevich <ilya@math.mps.ohio-state.edu>
 ;; Maintainer: FSF
diff --git a/lisp/tool-bar.el b/lisp/tool-bar.el
index e58114e5b26..d136facc66a 100644
--- a/lisp/tool-bar.el
+++ b/lisp/tool-bar.el
@@ -1,7 +1,7 @@
 ;;; tool-bar.el --- setting up the tool bar
 ;;
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Dave Love <fx@gnu.org>
 ;; Keywords: mouse frames
diff --git a/lisp/tooltip.el b/lisp/tooltip.el
index 596db839e84..f57758b9b48 100644
--- a/lisp/tooltip.el
+++ b/lisp/tooltip.el
@@ -1,7 +1,7 @@
 ;;; tooltip.el --- show tooltip windows
 
 ;; Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Gerd Moellmann <gerd@acm.org>
 ;; Keywords: help c mouse tools
diff --git a/lisp/tree-widget.el b/lisp/tree-widget.el
index 5fcb2dc8bf1..54bbbc9b1dd 100644
--- a/lisp/tree-widget.el
+++ b/lisp/tree-widget.el
@@ -1,6 +1,6 @@
 ;;; tree-widget.el --- Tree widget
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: David Ponce <david@dponce.com>
 ;; Maintainer: David Ponce <david@dponce.com>
diff --git a/lisp/tumme.el b/lisp/tumme.el
index 2fc6eff2458..8d4527d8ff4 100644
--- a/lisp/tumme.el
+++ b/lisp/tumme.el
@@ -1,6 +1,6 @@
 ;;; tumme.el --- use dired to browse and manipulate your images
 ;;
-;; Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Version: 0.4.11
 ;; Keywords: multimedia
@@ -335,7 +335,7 @@ Used together with `tumme-cmd-rotate-original-options'."
   :group 'tumme)
 
 (defcustom tumme-cmd-rotate-original-options
-  "%p -rotate %d -copy all \"%o\" > %t"
+  "%p -rotate %d -copy all -outfile %t \"%o\""
   "Format of command used to rotate original image.
 Available options are %p which is replaced by
 `tumme-cmd-rotate-original-program', %d which is replaced by the
diff --git a/lisp/tutorial.el b/lisp/tutorial.el
index 53f41c95646..c446400d906 100644
--- a/lisp/tutorial.el
+++ b/lisp/tutorial.el
@@ -1,6 +1,6 @@
 ;;; tutorial.el --- tutorial for Emacs
 
-;; Copyright (C) 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: help, internal
@@ -250,10 +250,9 @@ LEFT and RIGHT are the elements to compare."
 
              ;; * INSERTING AND DELETING
              ;; C-u 8 * to insert ********.
-             (delete-backward-char [backspace])
              (delete-backward-char "\d")
              (delete-char [?\C-d])
-             (backward-kill-word [(meta backspace)])
+             (backward-kill-word [?\M-\d])
              (kill-word [?\M-d])
              (kill-line [?\C-k])
              (kill-sentence [?\M-k])
@@ -422,90 +421,94 @@ where
   QUIET       is t if this changed keybinding should be handled quietly.
               This is used by `tutorial--display-changes'."
   (let (changed-keys remark)
-    (dolist (kdf default-keys)
-      ;; The variables below corresponds to those with the same names
-      ;; described in the doc string.
-      (let* ((key     (nth 1 kdf))
-             (def-fun (nth 0 kdf))
-             (def-fun-txt (format "%s" def-fun))
-             (rem-fun (command-remapping def-fun))
-             (key-fun (if (eq def-fun 'ESC-prefix)
-			  (lookup-key global-map [27])
-			(key-binding key)))
-             (where (where-is-internal (if rem-fun rem-fun def-fun))))
-        (if where
-            (progn
-              (setq where (key-description (car where)))
-              (when (and (< 10 (length where))
-                         (string= (substring where 0 (length "<menu-bar>"))
-                                  "<menu-bar>"))
-                (setq where "the menus")))
-          (setq where ""))
-        (setq remark nil)
-        (unless
-            (cond ((eq key-fun def-fun)
-                   ;; No rebinding, return t
-                   t)
-                  ((and key-fun
-			(eq key-fun (command-remapping def-fun)))
-                   ;; Just a remapping, return t
-                   t)
-                  ;; cua-mode specials:
-                  ((and cua-mode
-                        (or (and
-                             (equal key [?\C-v])
-                             (eq key-fun 'cua-paste))
-                            (and
-                             (equal key [?\C-z])
-                             (eq key-fun 'undo))))
-                   (setq remark (list "cua-mode, more info" 'cua-mode))
-                   nil)
-                  ((and cua-mode
-                        (or (and (eq def-fun 'ESC-prefix)
-				 (equal key-fun
-                                     `(keymap
-                                       (118 . cua-repeat-replace-region)))
-				 (setq def-fun-txt "\"ESC prefix\""))
-			    (and (eq def-fun 'mode-specific-command-prefix)
-				 (equal key-fun
-					'(keymap
-					  (timeout . copy-region-as-kill)))
-				 (setq def-fun-txt "\"C-c prefix\""))
-			    (and (eq def-fun 'Control-X-prefix)
-				 (equal key-fun
-					'(keymap (timeout . kill-region)))
-				 (setq def-fun-txt "\"C-x prefix\""))))
-                   (setq remark (list "cua-mode replacement" 'cua-mode))
-                   (setq where "Same key")
-                   nil)
-                  ;; viper-mode specials:
-                  ((and (boundp 'viper-mode-string)
-			(boundp 'viper-current-state)
-                        (eq viper-current-state 'vi-state)
-                        (or (and (eq def-fun 'isearch-forward)
-                                 (eq key-fun 'viper-isearch-forward))
-                            (and (eq def-fun 'isearch-backward)
-                                 (eq key-fun 'viper-isearch-backward))))
-                   ;; These bindings works as the default bindings,
-                   ;; return t
-                   t)
-                  ((when normal-erase-is-backspace
-                     (or (and (equal key [C-delete])
-                              (equal key-fun 'kill-word))
-                         (and (equal key [C-backspace])
-                              (equal key-fun 'backward-kill-word))))
-                   ;; This is the strange handling of C-delete and
-                   ;; C-backspace, return t
-                   t)
-                  (t
-                   ;; This key has indeed been rebound. Put information
-                   ;; in `remark' and return nil
-                   (setq remark
-                         (list "more info" 'current-binding
-                               key-fun def-fun key where))
-                   nil))
-          (add-to-list 'changed-keys
-                       (list key def-fun def-fun-txt where remark nil)))))
+    ;; Look up the bindings in a Fundamental mode buffer
+    ;; so we do not get fooled by some other major mode.
+    (with-temp-buffer
+      (fundamental-mode)
+      (dolist (kdf default-keys)
+	;; The variables below corresponds to those with the same names
+	;; described in the doc string.
+	(let* ((key     (nth 1 kdf))
+	       (def-fun (nth 0 kdf))
+	       (def-fun-txt (format "%s" def-fun))
+	       (rem-fun (command-remapping def-fun))
+	       (key-fun (if (eq def-fun 'ESC-prefix)
+			    (lookup-key global-map [27])
+			  (key-binding key)))
+	       (where (where-is-internal (if rem-fun rem-fun def-fun))))
+	  (if where
+	      (progn
+		(setq where (key-description (car where)))
+		(when (and (< 10 (length where))
+			   (string= (substring where 0 (length "<menu-bar>"))
+				    "<menu-bar>"))
+		  (setq where "the menus")))
+	    (setq where ""))
+	  (setq remark nil)
+	  (unless
+	      (cond ((eq key-fun def-fun)
+		     ;; No rebinding, return t
+		     t)
+		    ((and key-fun
+			  (eq key-fun (command-remapping def-fun)))
+		     ;; Just a remapping, return t
+		     t)
+		    ;; cua-mode specials:
+		    ((and cua-mode
+			  (or (and
+			       (equal key [?\C-v])
+			       (eq key-fun 'cua-paste))
+			      (and
+			       (equal key [?\C-z])
+			       (eq key-fun 'undo))))
+		     (setq remark (list "cua-mode, more info" 'cua-mode))
+		     nil)
+		    ((and cua-mode
+			  (or (and (eq def-fun 'ESC-prefix)
+				   (equal key-fun
+					  `(keymap
+					    (118 . cua-repeat-replace-region)))
+				   (setq def-fun-txt "\"ESC prefix\""))
+			      (and (eq def-fun 'mode-specific-command-prefix)
+				   (equal key-fun
+					  '(keymap
+					    (timeout . copy-region-as-kill)))
+				   (setq def-fun-txt "\"C-c prefix\""))
+			      (and (eq def-fun 'Control-X-prefix)
+				   (equal key-fun
+					  '(keymap (timeout . kill-region)))
+				   (setq def-fun-txt "\"C-x prefix\""))))
+		     (setq remark (list "cua-mode replacement" 'cua-mode))
+		     (setq where "Same key")
+		     nil)
+		    ;; viper-mode specials:
+		    ((and (boundp 'viper-mode-string)
+			  (boundp 'viper-current-state)
+			  (eq viper-current-state 'vi-state)
+			  (or (and (eq def-fun 'isearch-forward)
+				   (eq key-fun 'viper-isearch-forward))
+			      (and (eq def-fun 'isearch-backward)
+				   (eq key-fun 'viper-isearch-backward))))
+		     ;; These bindings works as the default bindings,
+		     ;; return t
+		     t)
+		    ((when normal-erase-is-backspace
+		       (or (and (equal key [C-delete])
+				(equal key-fun 'kill-word))
+			   (and (equal key [C-backspace])
+				(equal key-fun 'backward-kill-word))))
+		     ;; This is the strange handling of C-delete and
+		     ;; C-backspace, return t
+		     t)
+		    (t
+		     ;; This key has indeed been rebound. Put information
+		     ;; in `remark' and return nil
+		     (setq remark
+			   (list "more info" 'current-binding
+				 key-fun def-fun key where))
+		     nil))
+	    (add-to-list 'changed-keys
+			 (list key def-fun def-fun-txt where remark nil))))))
     changed-keys))
 
 (defun tutorial--key-description (key)
@@ -621,7 +624,7 @@ with some explanatory links."
       (setq file-name (concat file-name ".tut")))
     (expand-file-name file-name (tutorial--saved-dir))))
 
-(defun tutorial--remove-remarks()
+(defun tutorial--remove-remarks ()
   "Remove the remark lines that was added to the tutorial buffer."
   (save-excursion
     (goto-char (point-min))
@@ -908,7 +911,7 @@ string ids and values that are the language specific strings.
 
 See `get-lang-string' for more information.")
 
-(defun get-lang-string(lang stringid &optional no-eng-fallback)
+(defun get-lang-string (lang stringid &optional no-eng-fallback)
   "Get a language specific string for Emacs.
 In certain places Emacs can replace a string showed to the user with a language specific string.
 This function retrieves such strings.
diff --git a/lisp/type-break.el b/lisp/type-break.el
index ae18d2eeba4..98851bcab20 100644
--- a/lisp/type-break.el
+++ b/lisp/type-break.el
@@ -1,7 +1,7 @@
 ;;; type-break.el --- encourage rests from typing at appropriate intervals
 
 ;; Copyright (C) 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Noah Friedman
 ;; Maintainer: Noah Friedman <friedman@splode.com>
@@ -1131,11 +1131,10 @@ With optional non-nil ALL, force redisplay of all mode-lines."
       (progn
         (hanoi (/ (window-width) 8))
         ;; Wait for user to come back.
-        (read-char)
+        (read-event)
         (kill-buffer "*Hanoi*"))
     (quit
-     ;; eat char
-     (read-char)
+     (read-event)
      (and (get-buffer "*Hanoi*")
           (kill-buffer "*Hanoi*")))))
 
@@ -1153,11 +1152,10 @@ With optional non-nil ALL, force redisplay of all mode-lines."
           (progn
             (life 3)
             ;; wait for user to return
-            (read-char)
+            (read-event)
             (kill-buffer "*Life*"))
         (life-extinct
          (message "%s" (get 'life-extinct 'error-message))
-         (sit-for 3)
          ;; restart demo
          (setq continue t))
         (quit
@@ -1246,7 +1244,7 @@ With optional non-nil ALL, force redisplay of all mode-lines."
                      message))))
             (goto-char (point-min))
             (sit-for 60))
-          (read-char)
+          (read-event)
           (kill-buffer buffer-name))
       (quit
        (and (get-buffer buffer-name)
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index 24b49a983ad..d79add6899f 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -1,7 +1,7 @@
 ;;; uniquify.el --- unique buffer names dependent on file name
 
 ;; Copyright (C) 1989, 1995, 1996, 1997, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Dick King <king@reasoning.com>
 ;; Maintainer: FSF
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index c4a22bd314e..87c27a8786c 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,21 @@
+2007-01-14  Magnus Henoch  <mange@freemail.hu>
+
+	* url-proxy.el (url-proxy-object): Remove.
+	(url-proxy): Don't use `url-proxy-object'.  Act according to type of
+	proxy (currently only HTTP supported).
+
+	* url.el (url-retrieve-internal): Don't use `url-proxy-object'.
+
+	* url-http.el (url-http-proxy): New variable.
+	(url-http-create-request): Use it.  Don't use `url-proxy-object'.
+	(url-http): Treat `url' argument as resource to download, and
+	dynamic variable `url-using-proxy' as proxy to use.  Set
+	`url-current-object' to actual URL, and `url-http-proxy' to proxy
+	used.
+	(url-http-handle-cookies): Assume that `url-current-object' does
+	not point to the proxy used.
+	(url-http-async-sentinel): Adapt error message.
+
 2006-12-10  Juanma Barranquero  <lekktu@gmail.com>
 
 	* url-gw.el (url-gateway-nslookup-program): Doc fix.
@@ -1752,7 +1770,7 @@
 ;; End:
 
     Copyright (C) 1999, 2001, 2002, 2004, 2005,
-	2006  Free Software Foundation, Inc.
+	2006, 2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lisp/url/url-about.el b/lisp/url/url-about.el
index d0dcc6dc905..4c16d471e86 100644
--- a/lisp/url/url-about.el
+++ b/lisp/url/url-about.el
@@ -1,6 +1,6 @@
 ;;; url-about.el --- Show internal URLs
 
-;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-auth.el b/lisp/url/url-auth.el
index 5845b9d660e..c0f2c6bdf0f 100644
--- a/lisp/url/url-auth.el
+++ b/lisp/url/url-auth.el
@@ -1,7 +1,7 @@
 ;;; url-auth.el --- Uniform Resource Locator authorization modules
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-cache.el b/lisp/url/url-cache.el
index 5113ad0d7d9..f0802602c3f 100644
--- a/lisp/url/url-cache.el
+++ b/lisp/url/url-cache.el
@@ -1,7 +1,7 @@
 ;;; url-cache.el --- Uniform Resource Locator retrieval tool
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-cid.el b/lisp/url/url-cid.el
index f6e569a4b2f..6e3369f388b 100644
--- a/lisp/url/url-cid.el
+++ b/lisp/url/url-cid.el
@@ -1,6 +1,6 @@
 ;;; url-cid.el --- Content-ID URL loader
 
-;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-cookie.el b/lisp/url/url-cookie.el
index f3902619c89..cfe4f8ecf71 100644
--- a/lisp/url/url-cookie.el
+++ b/lisp/url/url-cookie.el
@@ -1,7 +1,7 @@
 ;;; url-cookie.el --- Netscape Cookie support
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-dav.el b/lisp/url/url-dav.el
index 546d744558d..25cdbdfadf8 100644
--- a/lisp/url/url-dav.el
+++ b/lisp/url/url-dav.el
@@ -1,6 +1,6 @@
 ;;; url-dav.el --- WebDAV support
 
-;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/url/url-dired.el b/lisp/url/url-dired.el
index 28f86560942..404068264af 100644
--- a/lisp/url/url-dired.el
+++ b/lisp/url/url-dired.el
@@ -1,7 +1,7 @@
 ;;; url-dired.el --- URL Dired minor mode
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, files
 
diff --git a/lisp/url/url-expand.el b/lisp/url/url-expand.el
index 4f422e5cc5f..43e6e18791b 100644
--- a/lisp/url/url-expand.el
+++ b/lisp/url/url-expand.el
@@ -1,6 +1,6 @@
 ;;; url-expand.el --- expand-file-name for URLs
 
-;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index c9bbebdfddb..1ad2e09e976 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -1,7 +1,7 @@
 ;;; url-file.el --- File retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-ftp.el b/lisp/url/url-ftp.el
index 8ff43ff57a5..67a4b091465 100644
--- a/lisp/url/url-ftp.el
+++ b/lisp/url/url-ftp.el
@@ -1,7 +1,7 @@
 ;;; url-ftp.el --- FTP wrapper
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index eaf654e2b4f..b2768212721 100644
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -1,6 +1,6 @@
 ;;; url-gw.el --- Gateway munging for URL loading
 
-;; Copyright (C) 1997, 1998, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
diff --git a/lisp/url/url-handlers.el b/lisp/url/url-handlers.el
index 97d10003620..91ac355a8c4 100644
--- a/lisp/url/url-handlers.el
+++ b/lisp/url/url-handlers.el
@@ -1,7 +1,7 @@
 ;;; url-handlers.el --- file-name-handler stuff for URL loading
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el
index 0cdfe329bc2..d595b1a14b0 100644
--- a/lisp/url/url-history.el
+++ b/lisp/url/url-history.el
@@ -1,7 +1,7 @@
 ;;; url-history.el --- Global history tracking for URL package
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 309be690408..eb193f1c7a6 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1,6 +1,6 @@
 ;;; url-http.el --- HTTP retrieval routines
 
-;; Copyright (C) 1999, 2001, 2004, 2005, 2006  Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2001, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
@@ -29,6 +29,7 @@
 (eval-when-compile (require 'cl))
 (defvar url-http-extra-headers)
 (defvar url-http-target-url)
+(defvar url-http-proxy)
 (require 'url-gw)
 (require 'url-util)
 (require 'url-parse)
@@ -154,11 +155,10 @@ request.")
   (declare (special proxy-info 
 		    url-http-method url-http-data
 		    url-http-extra-headers))
-  (url-http-debug "url-proxy-object is %s\n" url-proxy-object)
   (let* ((extra-headers)
 	 (request nil)
 	 (no-cache (cdr-safe (assoc "Pragma" url-http-extra-headers)))
-	 (using-proxy (not (eq url-current-object url-http-target-url)))
+	 (using-proxy url-http-proxy)
 	 (proxy-auth (if (or (cdr-safe (assoc "Proxy-Authorization"
 					      url-http-extra-headers))
 			     (not using-proxy))
@@ -379,8 +379,7 @@ This allows us to use `mail-fetch-field', etc."
 The buffer must already be narrowed to the headers, so `mail-fetch-field' will
 work correctly."
   (let ((cookies (mail-fetch-field "Set-Cookie" nil nil t))
-	(cookies2 (mail-fetch-field "Set-Cookie2" nil nil t))
-	(url-current-object url-http-target-url))
+	(cookies2 (mail-fetch-field "Set-Cookie2" nil nil t)))
     (and cookies (url-http-debug "Found %d Set-Cookie headers" (length cookies)))
     (and cookies2 (url-http-debug "Found %d Set-Cookie2 headers" (length cookies2)))
     (while cookies
@@ -1087,18 +1086,16 @@ CBARGS as the arguments."
 		    url-http-chunked-start
 		    url-http-chunked-counter
 		    url-http-process))
-  (let ((connection (url-http-find-free-connection (url-host url)
-						   (url-port url)))
-	(buffer (generate-new-buffer (format " *http %s:%d*"
-					     (url-host url)
-					     (url-port url)))))
+  (let* ((host (url-host (or url-using-proxy url)))
+	 (port (url-port (or url-using-proxy url)))
+	 (connection (url-http-find-free-connection host port))
+	 (buffer (generate-new-buffer (format " *http %s:%d*" host port))))
     (if (not connection)
 	;; Failed to open the connection for some reason
 	(progn
 	  (kill-buffer buffer)
 	  (setq buffer nil)
-	  (error "Could not create connection to %s:%d" (url-host url)
-		 (url-port url)))
+	  (error "Could not create connection to %s:%d" host port))
       (with-current-buffer buffer
 	(mm-disable-multibyte)
 	(setq url-current-object url
@@ -1120,7 +1117,8 @@ CBARGS as the arguments."
 		       url-http-method
 		       url-http-extra-headers
 		       url-http-data
-		       url-http-target-url))
+		       url-http-target-url
+		       url-http-proxy))
 	  (set (make-local-variable var) nil))
 
 	(setq url-http-method (or url-request-method "GET")
@@ -1133,8 +1131,8 @@ CBARGS as the arguments."
 	      url-callback-function callback
 	      url-callback-arguments cbargs
 	      url-http-after-change-function 'url-http-wait-for-headers-change-function
-	      url-http-target-url (or url-proxy-object
-				      url-current-object))
+	      url-http-target-url url-current-object
+	      url-http-proxy url-using-proxy)
 
 	(set-process-buffer connection buffer)
 	(set-process-filter connection 'url-http-generic-filter)
@@ -1145,8 +1143,7 @@ CBARGS as the arguments."
 	    (set-process-sentinel connection 'url-http-async-sentinel))
 	   ((eq status 'failed)
 	    ;; Asynchronous connection failed
-	    (error "Could not create connection to %s:%d" (url-host url)
-		   (url-port url)))
+	    (error "Could not create connection to %s:%d" host port))
 	   (t
 	    (set-process-sentinel connection 'url-http-end-of-document-sentinel)
 	    (process-send-string connection (url-http-create-request)))))))
@@ -1164,8 +1161,8 @@ CBARGS as the arguments."
      (t
       (setf (car url-callback-arguments)
 	    (nconc (list :error (list 'error 'connection-failed why
-				      :host (url-host url-current-object)
-				      :service (url-port url-current-object)))
+				      :host (url-host (or url-http-proxy url-current-object))
+				      :service (url-port (or url-http-proxy url-current-object))))
 		   (car url-callback-arguments)))
       (url-http-activate-callback)))))
 
diff --git a/lisp/url/url-imap.el b/lisp/url/url-imap.el
index a10db8e7445..da3fd887e3f 100644
--- a/lisp/url/url-imap.el
+++ b/lisp/url/url-imap.el
@@ -1,6 +1,6 @@
 ;;; url-imap.el --- IMAP retrieval routines
 
-;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Simon Josefsson <jas@pdc.kth.se>
 ;; Keywords: comm, data, processes
diff --git a/lisp/url/url-irc.el b/lisp/url/url-irc.el
index 19eec6f2ef2..b00b897a92c 100644
--- a/lisp/url/url-irc.el
+++ b/lisp/url/url-irc.el
@@ -1,7 +1,7 @@
 ;;; url-irc.el --- IRC URL interface
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-ldap.el b/lisp/url/url-ldap.el
index 64471bae5b1..b50bd714aa6 100644
--- a/lisp/url/url-ldap.el
+++ b/lisp/url/url-ldap.el
@@ -1,6 +1,6 @@
 ;;; url-ldap.el --- LDAP Uniform Resource Locator retrieval code
 
-;; Copyright (C) 1998, 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-mailto.el b/lisp/url/url-mailto.el
index d9d6e22cd05..9f20989a0b1 100644
--- a/lisp/url/url-mailto.el
+++ b/lisp/url/url-mailto.el
@@ -1,7 +1,7 @@
 ;;; url-mail.el --- Mail Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index 55166ee46f4..f29364f3499 100644
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -1,7 +1,7 @@
 ;;; url-methods.el --- Load URL schemes as needed
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-misc.el b/lisp/url/url-misc.el
index f7f9bcd439c..11771537ca2 100644
--- a/lisp/url/url-misc.el
+++ b/lisp/url/url-misc.el
@@ -1,7 +1,7 @@
 ;;; url-misc.el --- Misc Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2002, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-news.el b/lisp/url/url-news.el
index 47d4878c890..ab3c3ae31ad 100644
--- a/lisp/url/url-news.el
+++ b/lisp/url/url-news.el
@@ -1,7 +1,7 @@
 ;;; url-news.el --- News Uniform Resource Locator retrieval code
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-nfs.el b/lisp/url/url-nfs.el
index d6bc8417631..4f06f5e5bb3 100644
--- a/lisp/url/url-nfs.el
+++ b/lisp/url/url-nfs.el
@@ -1,7 +1,7 @@
 ;;; url-nfs.el --- NFS URL interface
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-ns.el b/lisp/url/url-ns.el
index 6b017b83ca9..c460a423b64 100644
--- a/lisp/url/url-ns.el
+++ b/lisp/url/url-ns.el
@@ -1,7 +1,7 @@
 ;;; url-ns.el --- Various netscape-ish functions for proxy definitions
 
 ;; Copyright (C) 1997, 1998, 1999, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-parse.el b/lisp/url/url-parse.el
index bda303697fb..2b69c54133f 100644
--- a/lisp/url/url-parse.el
+++ b/lisp/url/url-parse.el
@@ -1,7 +1,7 @@
 ;;; url-parse.el --- Uniform Resource Locator parser
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes
 
diff --git a/lisp/url/url-privacy.el b/lisp/url/url-privacy.el
index b57de81c813..0ea93b1857e 100644
--- a/lisp/url/url-privacy.el
+++ b/lisp/url/url-privacy.el
@@ -1,7 +1,7 @@
 ;;; url-privacy.el --- Global history tracking for URL package
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 5374030587b..76bea8d1435 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
 ;;; url-proxy.el --- Proxy server support
 
-;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -65,20 +65,17 @@
       (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical)
       nil))))
 
-(defvar url-proxy-object nil
-  "The URL to access through a proxy.
-This variable is bound by `url-proxy'.  If this is non-nil, the
-scheme-specific loader should use its argument as the proxy, and
-the value of this variable as the object to retrieve.")
-
 (defun url-proxy (url callback &optional cbargs)
   ;; Retrieve URL from a proxy.
   ;; Expects `url-using-proxy' to be bound to the specific proxy to use."
   (setq url-using-proxy (url-generic-parse-url url-using-proxy))
-  (let ((url-proxy-object (copy-sequence url)))
-    (url-set-target url-proxy-object nil)
-    (url-http url-using-proxy callback cbargs)))
 
+  (cond
+   ((string= (url-type url-using-proxy) "http")
+    (url-http url callback cbargs))
+   (t
+    (error "Don't know how to use proxy `%s'" url-using-proxy))))
+  
 (provide 'url-proxy)
 
 ;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 57c0f05661d..db7aac78bfd 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -1,7 +1,7 @@
 ;;; url-util.el --- Miscellaneous helper routines for URL library
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 97f6fc129fb..705eb947001 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -1,7 +1,7 @@
 ;;; url-vars.el --- Variables for Uniform Resource Locator tool
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 4ba604203dc..a150733e40d 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -1,7 +1,7 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 
 ;; Copyright (C) 1996, 1997, 1998, 1999, 2001, 2004,
-;;   2005, 2006  Free Software Foundation, Inc.
+;;   2005, 2006, 2007  Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Keywords: comm, data, processes, hypermedia
@@ -172,7 +172,6 @@ the list of events, as described in the docstring of `url-retrieve'."
   (unless (url-type url)
     (error "Bad url: %s" (url-recreate-url url)))
   (let ((loader (url-scheme-get-property (url-type url) 'loader))
-	(url-proxy-object nil)
 	(url-using-proxy (if (url-host url)
 			     (url-find-proxy-for-url url (url-host url))))
 	(buffer nil)
diff --git a/lisp/url/vc-dav.el b/lisp/url/vc-dav.el
index 8181788a05c..b19f43a64be 100644
--- a/lisp/url/vc-dav.el
+++ b/lisp/url/vc-dav.el
@@ -1,6 +1,6 @@
 ;;; vc-dav.el --- vc.el support for WebDAV
 
-;; Copyright (C) 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2001, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Bill Perry <wmperry@gnu.org>
 ;; Maintainer: Bill Perry <wmperry@gnu.org>
diff --git a/lisp/userlock.el b/lisp/userlock.el
index bf35e92933c..329d46c2124 100644
--- a/lisp/userlock.el
+++ b/lisp/userlock.el
@@ -1,7 +1,7 @@
 ;;; userlock.el --- handle file access contention between multiple users
 
 ;; Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/vc-arch.el b/lisp/vc-arch.el
index bac6c26cc93..0f02db0ba96 100644
--- a/lisp/vc-arch.el
+++ b/lisp/vc-arch.el
@@ -1,6 +1,6 @@
 ;;; vc-arch.el --- VC backend for the Arch version-control system
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
@@ -152,7 +152,7 @@ Only the value `maybe' can be trusted :-(."
 	(with-temp-buffer
 	  (insert-file-contents idfile)
 	  (looking-at ".*[^ \n\t]")
-	  (match-string 0)))
+	  (match-string 0))
       (with-current-buffer (find-file-noselect file)
 	(save-excursion
 	  (goto-char (point-max))
@@ -161,7 +161,7 @@ Only the value `maybe' can be trusted :-(."
 		    (goto-char (point-min))
 		    (re-search-forward vc-arch-tagline-re (+ (point) 1000) t)))
 	      (match-string 1)
-	    (concat "./" (file-relative-name file (vc-arch-root file))))))))
+	    (concat "./" (file-relative-name file (vc-arch-root file)))))))))
 
 (defun vc-arch-tagging-method (file)
   (with-current-buffer
diff --git a/lisp/vc-cvs.el b/lisp/vc-cvs.el
index 94fd3d0acd9..583e02efd5d 100644
--- a/lisp/vc-cvs.el
+++ b/lisp/vc-cvs.el
@@ -1,7 +1,7 @@
 ;;; vc-cvs.el --- non-resident support for CVS version-control
 
 ;; Copyright (C) 1995, 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-hooks.el b/lisp/vc-hooks.el
index 7aae75c8a76..df66c817293 100644
--- a/lisp/vc-hooks.el
+++ b/lisp/vc-hooks.el
@@ -1,7 +1,7 @@
 ;;; vc-hooks.el --- resident support for version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-;;   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-mcvs.el b/lisp/vc-mcvs.el
index 4075ffc3649..7e5dbd47a70 100644
--- a/lisp/vc-mcvs.el
+++ b/lisp/vc-mcvs.el
@@ -1,6 +1,6 @@
 ;;; vc-mcvs.el --- VC backend for the Meta-CVS version-control system
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
diff --git a/lisp/vc-rcs.el b/lisp/vc-rcs.el
index 00700c5a652..ae4758169f4 100644
--- a/lisp/vc-rcs.el
+++ b/lisp/vc-rcs.el
@@ -1,7 +1,7 @@
 ;;; vc-rcs.el --- support for RCS version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-sccs.el b/lisp/vc-sccs.el
index ae349f57f32..bad1c2b3099 100644
--- a/lisp/vc-sccs.el
+++ b/lisp/vc-sccs.el
@@ -1,7 +1,7 @@
 ;;; vc-sccs.el --- support for SCCS version-control
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see vc.el for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vc-svn.el b/lisp/vc-svn.el
index 0394c11b8de..916930ffde2 100644
--- a/lisp/vc-svn.el
+++ b/lisp/vc-svn.el
@@ -1,6 +1,6 @@
 ;;; vc-svn.el --- non-resident support for Subversion version-control
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:      FSF (see vc.el for full credits)
 ;; Maintainer:  Stefan Monnier <monnier@gnu.org>
@@ -495,7 +495,7 @@ and that it passes `vc-svn-global-switches' to it before FLAGS."
 					dirname)))
     (goto-char (point-min))
     (when (re-search-forward
-	   ;; Old `svn' used name="svn:dir", newer use just name="".
+	   ;; Old `svn' used name="svn:this_dir", newer use just name="".
 	   (concat "name=\"\\(?:svn:this_dir\\)?\"[\n\t ]*"
 		   "\\(?:[-a-z]+=\"[^\"]*\"[\n\t ]*\\)*?"
 		   "url=\"\\([^\"]+\\)\"") nil t)
@@ -511,9 +511,13 @@ information about FILENAME and return its status."
   (let (file status)
     (goto-char (point-min))
     (while (re-search-forward
-	    "^[ ADMCI?!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\) +" nil t)
-      (setq file (expand-file-name
-		  (buffer-substring (point) (line-end-position))))
+            ;; Ignore the files with status in [IX?].
+	    "^[ ACDGMR!~][ MC][ L][ +][ S]..\\([ *]\\) +\\([-0-9]+\\) +\\([0-9?]+\\) +\\([^ ]+\\) +" nil t)
+      ;; If the username contains spaces, the output format is ambiguous,
+      ;; so don't trust the output's filename unless we have to.
+      (setq file (or filename
+                     (expand-file-name
+                      (buffer-substring (point) (line-end-position)))))
       (setq status (char-after (line-beginning-position)))
       (unless (eq status ??)
 	;; `vc-BACKEND-registered' must not set vc-backend,
diff --git a/lisp/vc.el b/lisp/vc.el
index afeba8d2409..450bfb3c938 100644
--- a/lisp/vc.el
+++ b/lisp/vc.el
@@ -1,7 +1,7 @@
 ;;; vc.el --- drive a version-control system from within Emacs
 
 ;; Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-;;   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:     FSF (see below for full credits)
 ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 22b1d0fdd76..f8812f8723d 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -1,7 +1,7 @@
 ;;; vcursor.el --- manipulate an alternative ("virtual") cursor
 
 ;; Copyright (C) 1994, 1996, 1998, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author:   Peter Stephenson <pws@ibmth.df.unipi.it>
 ;; Maintainer: FSF
diff --git a/lisp/version.el b/lisp/version.el
index d975d89f821..8e2e7e8453a 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -1,7 +1,7 @@
 ;;; version.el --- record version number of Emacs -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1985, 1992, 1994, 1995, 1999, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/view.el b/lisp/view.el
index 457d5efc1c1..f914624d6f6 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -1,7 +1,7 @@
 ;;; view.el --- peruse file or buffer without editing
 
 ;; Copyright (C) 1985, 1989, 1994, 1995, 1997, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: K. Shane Hartman
 ;; Maintainer: Inge Frick <inge@nada.kth.se>
diff --git a/lisp/vms-patch.el b/lisp/vms-patch.el
index 5c65dd13976..d848f2246ae 100644
--- a/lisp/vms-patch.el
+++ b/lisp/vms-patch.el
@@ -1,7 +1,7 @@
 ;;; vms-patch.el --- override parts of files.el for VMS
 
 ;; Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: vms
diff --git a/lisp/vmsproc.el b/lisp/vmsproc.el
index 84ec1e2b93a..71bb5e01574 100644
--- a/lisp/vmsproc.el
+++ b/lisp/vmsproc.el
@@ -1,7 +1,7 @@
 ;;; vmsproc.el --- run asynchronous VMS subprocesses under Emacs
 
 ;; Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Mukesh Prasad
 ;; Maintainer: FSF
diff --git a/lisp/vt-control.el b/lisp/vt-control.el
index bc16a260b29..4b78be36f4e 100644
--- a/lisp/vt-control.el
+++ b/lisp/vt-control.el
@@ -1,7 +1,7 @@
 ;;; vt-control.el --- Common VTxxx control functions
 
 ;; Copyright (C) 1993, 1994, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
 ;; Maintainer: Rob Riepel <riepel@networking.stanford.edu>
diff --git a/lisp/vt100-led.el b/lisp/vt100-led.el
index caf27f55b42..5d25eb104df 100644
--- a/lisp/vt100-led.el
+++ b/lisp/vt100-led.el
@@ -1,7 +1,7 @@
 ;;; vt100-led.el --- functions for LED control on VT-100 terminals & clones
 
 ;; Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Howard Gayle
 ;; Maintainer: FSF
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index e73aa0d696d..26aafeb27fc 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -1,7 +1,7 @@
 ;;; w32-fns.el --- Lisp routines for Windows NT
 
 ;; Copyright (C) 1994, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Geoff Voelker <voelker@cs.washington.edu>
 ;; Keywords: internal
diff --git a/lisp/w32-vars.el b/lisp/w32-vars.el
index 0918ed4c569..81d15c9ae1e 100644
--- a/lisp/w32-vars.el
+++ b/lisp/w32-vars.el
@@ -1,6 +1,6 @@
 ;;; w32-vars.el --- MS-Windows specific user options
 
-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jason Rumney <jasonr@gnu.org>
 ;; Keywords: internal
diff --git a/lisp/wdired.el b/lisp/wdired.el
index 2c43b6f1552..4cc5a3c48c0 100644
--- a/lisp/wdired.el
+++ b/lisp/wdired.el
@@ -1,6 +1,6 @@
 ;;; wdired.el --- Rename files editing their names in dired buffers
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Filename: wdired.el
 ;; Author: Juan León Lahoz García <juanleon1@gmail.com>
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index a5ae328f500..dc7f691e721 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -1,7 +1,7 @@
 ;;; whitespace.el --- warn about and clean bogus whitespaces in the file
 
 ;; Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Rajesh Vaidheeswarran <rv@gnu.org>
 ;; Keywords: convenience
diff --git a/lisp/wid-browse.el b/lisp/wid-browse.el
index 4d0520dc4fd..799d9ae760e 100644
--- a/lisp/wid-browse.el
+++ b/lisp/wid-browse.el
@@ -1,7 +1,7 @@
 ;;; wid-browse.el --- functions for browsing widgets
 ;;
 ;; Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: extensions
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index 935d2b7719d..2e11b655752 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -1,7 +1,7 @@
 ;;; wid-edit.el --- Functions for creating and using widgets -*-byte-compile-dynamic: t;-*-
 ;;
 ;; Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Maintainer: FSF
diff --git a/lisp/widget.el b/lisp/widget.el
index 5d828373314..cfdb92eaa0f 100644
--- a/lisp/widget.el
+++ b/lisp/widget.el
@@ -1,7 +1,7 @@
 ;;; widget.el --- a library of user interface components
 ;;
 ;; Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, extensions, faces, hypermedia
diff --git a/lisp/windmove.el b/lisp/windmove.el
index 5c7ebfd74ea..79e87e0d36c 100644
--- a/lisp/windmove.el
+++ b/lisp/windmove.el
@@ -1,7 +1,7 @@
 ;;; windmove.el --- directional window-selection routines
 ;;
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 ;;
 ;; Author: Hovav Shacham (hovav@cs.stanford.edu)
 ;; Created: 17 October 1998
diff --git a/lisp/window.el b/lisp/window.el
index 2316eb916eb..921d84d6e7d 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1,7 +1,7 @@
 ;;; window.el --- GNU Emacs window commands aside from those written in C
 
 ;; Copyright (C) 1985, 1989, 1992, 1993, 1994, 2000, 2001, 2002,
-;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: internal
diff --git a/lisp/winner.el b/lisp/winner.el
index de0dcde6b06..033876a5883 100644
--- a/lisp/winner.el
+++ b/lisp/winner.el
@@ -1,7 +1,7 @@
 ;;; winner.el --- Restore old window configurations
 
 ;; Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation. Inc.
+;;   2005, 2006, 2007 Free Software Foundation. Inc.
 
 ;; Author: Ivar Rummelhoff <ivarru@math.uio.no>
 ;; Created: 27 Feb 1997
diff --git a/lisp/woman.el b/lisp/woman.el
index f880c6810f9..728bf347d9f 100644
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -1,7 +1,7 @@
 ;;; woman.el --- browse UN*X manual pages `wo (without) man'
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
-;;   2006 Free Software Foundation, Inc.
+;;   2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Francis J. Wright <F.J.Wright@qmul.ac.uk>
 ;; Maintainer: FSF
diff --git a/lisp/x-dnd.el b/lisp/x-dnd.el
index 1c72d0a65fe..055e4305d9f 100644
--- a/lisp/x-dnd.el
+++ b/lisp/x-dnd.el
@@ -1,6 +1,6 @@
 ;;; x-dnd.el --- drag and drop support for X.
 
-;; Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Jan Dj,Ad(Brv <jan.h.d@swipnet.se>
 ;; Maintainer: FSF
diff --git a/lisp/xml.el b/lisp/xml.el
index ca8f5bdc81b..5b694d50f12 100644
--- a/lisp/xml.el
+++ b/lisp/xml.el
@@ -1,7 +1,7 @@
 ;;; xml.el --- XML parser
 
 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Emmanuel Briot  <briot@gnat.com>
 ;; Maintainer: Mark A. Hershberger <mah@everybody.org>
diff --git a/lisp/xt-mouse.el b/lisp/xt-mouse.el
index 2d1710fce01..899049cef03 100644
--- a/lisp/xt-mouse.el
+++ b/lisp/xt-mouse.el
@@ -1,7 +1,7 @@
 ;;; xt-mouse.el --- support the mouse when emacs run in an xterm
 
 ;; Copyright (C) 1994, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: mouse, terminals
diff --git a/lispintro/ChangeLog b/lispintro/ChangeLog
index 72772f597d3..96491b93c08 100644
--- a/lispintro/ChangeLog
+++ b/lispintro/ChangeLog
@@ -229,7 +229,7 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-	2006 Free Software Foundation, Inc.
+	2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lispintro/Makefile.in b/lispintro/Makefile.in
index cfc9b9b3bfd..13ff68fbb16 100644
--- a/lispintro/Makefile.in
+++ b/lispintro/Makefile.in
@@ -1,7 +1,7 @@
 #### Makefile for the Emacs Lisp Introduction manual
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-#   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lispintro/Makefile.old b/lispintro/Makefile.old
index 248de3d9c9c..0b4e1a82df7 100644
--- a/lispintro/Makefile.old
+++ b/lispintro/Makefile.old
@@ -1,6 +1,7 @@
 # Makefile.in generated automatically by automake 1.4-p4 from Makefile.am
 
-# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc.
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+#   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
diff --git a/lispintro/aclocal.m4 b/lispintro/aclocal.m4
index 2568263f93b..fdc191af0d1 100644
--- a/lispintro/aclocal.m4
+++ b/lispintro/aclocal.m4
@@ -1,7 +1,7 @@
 dnl aclocal.m4 generated automatically by aclocal 1.4-p4
 
-dnl Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003,
-dnl   2004, 2005, 2006 Free Software Foundation, Inc.
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+dnl   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/lispintro/configure b/lispintro/configure
index 0fdc8ced824..626083be946 100644
--- a/lispintro/configure
+++ b/lispintro/configure
@@ -2,7 +2,8 @@
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
diff --git a/lispintro/cons-1.eps b/lispintro/cons-1.eps
index 6ec005c7cb0..ea2c4168956 100644
--- a/lispintro/cons-1.eps
+++ b/lispintro/cons-1.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-2.eps b/lispintro/cons-2.eps
index bad0c75e6e2..b6fb796b452 100644
--- a/lispintro/cons-2.eps
+++ b/lispintro/cons-2.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-3.eps b/lispintro/cons-3.eps
index 64e6e58f4e6..ea3f8d4c80d 100644
--- a/lispintro/cons-3.eps
+++ b/lispintro/cons-3.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-4.eps b/lispintro/cons-4.eps
index 04e9706fb66..80947b45a8e 100644
--- a/lispintro/cons-4.eps
+++ b/lispintro/cons-4.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/cons-5.eps b/lispintro/cons-5.eps
index 83a17d5e3e1..a49bb062c16 100644
--- a/lispintro/cons-5.eps
+++ b/lispintro/cons-5.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/drawers.eps b/lispintro/drawers.eps
index 9bfc5aa8a7e..b0f2f64e0a9 100644
--- a/lispintro/drawers.eps
+++ b/lispintro/drawers.eps
@@ -9,6 +9,26 @@
 %%EndComments
 %%BeginProlog
 
+% Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 53 dict def
 tgifdict begin
 
diff --git a/lispintro/emacs-lisp-intro.texi b/lispintro/emacs-lisp-intro.texi
index afa10333953..6e125989446 100644
--- a/lispintro/emacs-lisp-intro.texi
+++ b/lispintro/emacs-lisp-intro.texi
@@ -115,7 +115,7 @@
 @c After creating the Info file, edit your Info `dir' file, if the
 @c `dircategory' section below does not enable your system to
 @c install the manual automatically.
-@c (The `dir' file is often in the `/usr/local/info/' directory.)
+@c (The `dir' file is often in the `/usr/local/share/info/' directory.)
 
 @c ================ How to Create an HTML file ================
 
@@ -216,7 +216,7 @@ people who are not programmers.
 Edition @value{edition-number}, @value{update-date}
 @sp 1
 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1997, 2001,
-   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @sp 1
 
 @iftex
diff --git a/lispintro/lambda-1.eps b/lispintro/lambda-1.eps
index ef5dddd91e0..14780fefe76 100644
--- a/lispintro/lambda-1.eps
+++ b/lispintro/lambda-1.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/lambda-2.eps b/lispintro/lambda-2.eps
index 38f7dba9f06..5d2717342ac 100644
--- a/lispintro/lambda-2.eps
+++ b/lispintro/lambda-2.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/lambda-3.eps b/lispintro/lambda-3.eps
index e94af70dec6..4f16e9d9185 100644
--- a/lispintro/lambda-3.eps
+++ b/lispintro/lambda-3.eps
@@ -7,6 +7,26 @@
 %	Due to bugs in Transcript, the 'PS-Adobe-' stuff is omitted from line 1
 %
 
+% Copyright (C) 1995, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+%   Free Software Foundation, Inc.
+%
+% This file is part of GNU Emacs.
+%
+% GNU Emacs is free software; you can redistribute it and/or modify
+% it under the terms of the GNU General Public License as published by
+% the Free Software Foundation; either version 2, or (at your option)
+% any later version.
+%
+% GNU Emacs is distributed in the hope that it will be useful,
+% but WITHOUT ANY WARRANTY; without even the implied warranty of
+% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+% GNU General Public License for more details.
+%
+% You should have received a copy of the GNU General Public License
+% along with GNU Emacs; see the file COPYING.  If not, write to
+% the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+% Boston, MA 02110-1301, USA.
+
 /tgifdict 132 dict def
 tgifdict begin
 
diff --git a/lispintro/makefile.w32-in b/lispintro/makefile.w32-in
index c0b4b2a7b69..579d93481b6 100644
--- a/lispintro/makefile.w32-in
+++ b/lispintro/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Lisp Introduction manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lispintro/missing b/lispintro/missing
index b42ff5a1061..5b73d25789b 100644
--- a/lispintro/missing
+++ b/lispintro/missing
@@ -1,6 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+#   Free Software Foundation, Inc.
 # Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
diff --git a/lispref/ChangeLog b/lispref/ChangeLog
index 3f62d3e545b..2d73fe08a96 100644
--- a/lispref/ChangeLog
+++ b/lispref/ChangeLog
@@ -1,10 +1,32 @@
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+	* tips.texi (Coding Conventions): Clarify the tip about macros
+	that define a function or a variable.
+
+	* files.texi (File Attributes): UID and GID can be floats.
+	(Magic File Names): Explain why deferring all operations to
+	the standard handler does not work.
+
+2007-01-23  Martin Rudalics  <rudalics@gmx.at>
+
+	* backups.texi (Reverting): Use "buffer" instead of "file"
+	when talking about major and minor modes.
+
+2007-01-21  Richard Stallman  <rms@gnu.org>
+
+	* help.texi (Documentation): Add xref to Documentation Tips.
+
+2007-01-14  Juanma Barranquero  <lekktu@gmail.com>
+
+	* tips.texi (Coding Conventions): Fix typos.
+
 2007-01-05  Richard Stallman  <rms@gnu.org>
 
 	* modes.texi (Defining Minor Modes): Fix previous change.
 
 2007-01-03  Richard Stallman  <rms@gnu.org>
 
-	* customize.texi (Variable Definitions, Customization Types): 
+	* customize.texi (Variable Definitions, Customization Types):
 	Don't use * in doc string for defcustom.
 
 2007-01-02  Richard Stallman  <rms@gnu.org>
@@ -72,8 +94,8 @@
 
 2006-12-16  Eli Zaretskii  <eliz@gnu.org>
 
-	* internals.texi (Building Emacs, Writing Emacs Primitives): Add
-	index entries.
+	* internals.texi (Building Emacs, Writing Emacs Primitives):
+	Add index entries.
 
 2006-12-11  Richard Stallman  <rms@gnu.org>
 
@@ -5586,7 +5608,7 @@ Tue Apr 11 12:23:28 1989  Robert J. Chassell  (bob@rice-chex.ai.mit.edu)
 ;; End:
 
     Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+      2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lispref/Makefile.in b/lispref/Makefile.in
index e32a99e6e98..9abd45f8f15 100644
--- a/lispref/Makefile.in
+++ b/lispref/Makefile.in
@@ -1,7 +1,7 @@
 # Makefile for the GNU Emacs Lisp Reference Manual.
 
 # Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000,
-#   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lispref/abbrevs.texi b/lispref/abbrevs.texi
index 6facbf1e3b8..53f6f194ee1 100644
--- a/lispref/abbrevs.texi
+++ b/lispref/abbrevs.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1999, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/abbrevs
 @node Abbrevs, Processes, Syntax Tables, Top
diff --git a/lispref/advice.texi b/lispref/advice.texi
index a21bce33448..003e12ad833 100644
--- a/lispref/advice.texi
+++ b/lispref/advice.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/advising
 @node Advising Functions, Debugging, Byte Compilation, Top
diff --git a/lispref/anti.texi b/lispref/anti.texi
index 50f93c49bf6..de07936d2f4 100644
--- a/lispref/anti.texi
+++ b/lispref/anti.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1999, 2002, 2003, 2004, 2005,
-@c   2006 Free Software Foundation, Inc.
+@c   2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This node must have no pointers.
diff --git a/lispref/backups.texi b/lispref/backups.texi
index 549c5f6c62c..893f6df4205 100644
--- a/lispref/backups.texi
+++ b/lispref/backups.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/backups
 @node Backups and Auto-Saving, Buffers, Files, Top
@@ -683,7 +683,7 @@ Normally, @code{revert-buffer} asks for confirmation before it changes
 the buffer; but if the argument @var{noconfirm} is non-@code{nil},
 @code{revert-buffer} does not ask for confirmation.
 
-Normally, this command reinitializes the file's major and minor modes
+Normally, this command reinitializes the buffer's major and minor modes
 using @code{normal-mode}.  But if @var{preserve-modes} is
 non-@code{nil}, the modes remain unchanged.
 
diff --git a/lispref/buffers.texi b/lispref/buffers.texi
index 3b9750f00a2..a0c2d1aa566 100644
--- a/lispref/buffers.texi
+++ b/lispref/buffers.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/buffers
 @node Buffers, Windows, Backups and Auto-Saving, Top
diff --git a/lispref/commands.texi b/lispref/commands.texi
index 0f45ddbdd04..6cbf6e70099 100644
--- a/lispref/commands.texi
+++ b/lispref/commands.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/commands
 @node Command Loop, Keymaps, Minibuffers, Top
diff --git a/lispref/compile.texi b/lispref/compile.texi
index 1b18e0ee284..0d63887e1cc 100644
--- a/lispref/compile.texi
+++ b/lispref/compile.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/compile
 @node Byte Compilation, Advising Functions, Loading, Top
diff --git a/lispref/configure b/lispref/configure
index 93cc63efd65..7f67f08dfa3 100755
--- a/lispref/configure
+++ b/lispref/configure
@@ -2,7 +2,8 @@
 
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13
-# Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
diff --git a/lispref/control.texi b/lispref/control.texi
index 93d5bb36d8c..cbc7b55ddb5 100644
--- a/lispref/control.texi
+++ b/lispref/control.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/control
 @node Control Structures, Variables, Evaluation, Top
diff --git a/lispref/customize.texi b/lispref/customize.texi
index 621124acb97..3d7e9b00172 100644
--- a/lispref/customize.texi
+++ b/lispref/customize.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1997, 1998, 1999, 2000, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/customize
 @node Customization, Loading, Macros, Top
diff --git a/lispref/debugging.texi b/lispref/debugging.texi
index 854e0ef1ca2..cce112a0aa0 100644
--- a/lispref/debugging.texi
+++ b/lispref/debugging.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/debugging
 @node Debugging, Read and Print, Advising Functions, Top
diff --git a/lispref/display.texi b/lispref/display.texi
index a60cb9ab69d..3c49cd08653 100644
--- a/lispref/display.texi
+++ b/lispref/display.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/display
 @node Display, System Interface, Processes, Top
diff --git a/lispref/edebug.texi b/lispref/edebug.texi
index 98718aba74b..4082fdfe5c2 100644
--- a/lispref/edebug.texi
+++ b/lispref/edebug.texi
@@ -1,7 +1,7 @@
 @comment -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1992, 1993, 1994, 1998, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 @c This file can also be used by an independent Edebug User
diff --git a/lispref/elisp.texi b/lispref/elisp.texi
index bfd91c58562..b3486fb5c8d 100644
--- a/lispref/elisp.texi
+++ b/lispref/elisp.texi
@@ -7,7 +7,7 @@
 @c Version of the manual and of Emacs.
 @c Please remember to update the edition number in README as well.
 @set VERSION  2.9
-@set EMACSVER 22.0.92
+@set EMACSVER 22.0.93
 
 @dircategory Emacs
 @direntry
@@ -40,8 +40,8 @@ This is edition @value{VERSION} of the GNU Emacs Lisp
 Reference Manual, corresponding to Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1998,
-1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/lispref/errors.texi b/lispref/errors.texi
index 092a2662e5b..98c30fcd4a1 100644
--- a/lispref/errors.texi
+++ b/lispref/errors.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/errors
 @node Standard Errors, Standard Buffer-Local Variables, GNU Emacs Internals, Top
diff --git a/lispref/eval.texi b/lispref/eval.texi
index 05229c1b7c0..d085491d2d2 100644
--- a/lispref/eval.texi
+++ b/lispref/eval.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/eval
 @node Evaluation, Control Structures, Symbols, Top
diff --git a/lispref/files.texi b/lispref/files.texi
index 36e44dbece6..f13888197c7 100644
--- a/lispref/files.texi
+++ b/lispref/files.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/files
 @node Files, Backups and Auto-Saving, Documentation, Top
@@ -1157,11 +1157,12 @@ links, can be created by using the @code{add-name-to-file} function
 (@pxref{Changing Files}).
 
 @item
-The file's @acronym{UID} as a string or an integer.  If a string
-value cannot be looked up, the integer value is returned.
+The file's @acronym{UID}, normally as a string.  However, if it does
+not correspond to a named user, the value is an integer or a floating
+point number.
 
 @item
-The file's @acronym{GID} likewise.
+The file's @acronym{GID}, likewise.
 
 @item
 The time of last access, as a list of two integers.
@@ -2554,7 +2555,7 @@ whose match starts last in the file name gets precedence.  This rule
 is chosen so that handlers for jobs such as uncompression are handled
 first, before handlers for jobs such as remote file access.
 
-Here are the operations that a magic file name handler gets to handle:
+  Here are the operations that a magic file name handler gets to handle:
 
 @ifnottex
 @noindent
@@ -2704,6 +2705,14 @@ avoids inefficiency, but its main purpose is for autoloaded handler
 functions, so that they won't be loaded except when they have real
 work to do.
 
+  Simply deferring all operations to the usual primitives does not
+work.  For instance, if the file name handler applies to
+@code{file-exists-p}, then it must handle @code{load} itself, because
+the usual @code{load} code won't work properly in that case.  However,
+if the handler uses the @code{operations} property to say it doesn't
+handle @code{file-exists-p}, then it need not handle @code{load}
+nontrivially.
+
 @defvar inhibit-file-name-handlers
 This variable holds a list of handlers whose use is presently inhibited
 for a certain operation.
diff --git a/lispref/frames.texi b/lispref/frames.texi
index f27aa35432c..32f9e071f09 100644
--- a/lispref/frames.texi
+++ b/lispref/frames.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/frames
 @node Frames, Positions, Windows, Top
diff --git a/lispref/functions.texi b/lispref/functions.texi
index a4c0b4b8fe4..084f2a57d50 100644
--- a/lispref/functions.texi
+++ b/lispref/functions.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/functions
 @node Functions, Macros, Variables, Top
diff --git a/lispref/hash.texi b/lispref/hash.texi
index 4c2c3469c86..6a7fd26ae8b 100644
--- a/lispref/hash.texi
+++ b/lispref/hash.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1999, 2002, 2003, 2004, 2005,
-@c   2006 Free Software Foundation, Inc.
+@c Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+@c   2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/hash
 @node Hash Tables, Symbols, Sequences Arrays Vectors, Top
diff --git a/lispref/help.texi b/lispref/help.texi
index ecccff421c7..0939d384a4e 100644
--- a/lispref/help.texi
+++ b/lispref/help.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/help
 @node Documentation, Files, Modes, Top
@@ -22,8 +22,9 @@ of documentation strings is not sufficient as a manual because a good
 manual is not organized in that fashion; it is organized in terms of
 topics of discussion.
 
-  For commands to access documentation strings, see @ref{Help, ,
-Help, emacs, The GNU Emacs Manual}.
+  For commands to display documentation strings, see @ref{Help, ,
+Help, emacs, The GNU Emacs Manual}.  For the conventions for writing
+documentation strings, see @ref{Documentation Tips}.
 
 @menu
 * Documentation Basics::      Good style for doc strings.
diff --git a/lispref/hooks.texi b/lispref/hooks.texi
index 842211d6be5..019777f5eed 100644
--- a/lispref/hooks.texi
+++ b/lispref/hooks.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/hooks
 @node Standard Hooks, Index, Standard Keymaps, Top
diff --git a/lispref/internals.texi b/lispref/internals.texi
index 7767f0feeb3..60ea9769150 100644
--- a/lispref/internals.texi
+++ b/lispref/internals.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1998, 1999, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/internals
 @node GNU Emacs Internals, Standard Errors, Tips, Top
diff --git a/lispref/intro.texi b/lispref/intro.texi
index cd9b36ced85..c919a46610d 100644
--- a/lispref/intro.texi
+++ b/lispref/intro.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/intro
 
diff --git a/lispref/keymaps.texi b/lispref/keymaps.texi
index 023fddaba58..0cd653984e9 100644
--- a/lispref/keymaps.texi
+++ b/lispref/keymaps.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2000, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/keymaps
 @node Keymaps, Modes, Command Loop, Top
diff --git a/lispref/lists.texi b/lispref/lists.texi
index cf725413895..24214bbc357 100644
--- a/lispref/lists.texi
+++ b/lispref/lists.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/lists
 @node Lists, Sequences Arrays Vectors, Strings and Characters, Top
diff --git a/lispref/loading.texi b/lispref/loading.texi
index 150e20275b1..004989ad38a 100644
--- a/lispref/loading.texi
+++ b/lispref/loading.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/loading
 @node Loading, Byte Compilation, Customization, Top
diff --git a/lispref/locals.texi b/lispref/locals.texi
index 78c2d04fda2..712c8aa9701 100644
--- a/lispref/locals.texi
+++ b/lispref/locals.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/locals
 @node Standard Buffer-Local Variables, Standard Keymaps, Standard Errors, Top
diff --git a/lispref/macros.texi b/lispref/macros.texi
index 01805f6655b..80d8e9c0786 100644
--- a/lispref/macros.texi
+++ b/lispref/macros.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/macros
 @node Macros, Customization, Functions, Top
diff --git a/lispref/makefile.w32-in b/lispref/makefile.w32-in
index 23ea3f05df5..dc312691dab 100644
--- a/lispref/makefile.w32-in
+++ b/lispref/makefile.w32-in
@@ -1,6 +1,6 @@
 # -*- Makefile -*- for the GNU Emacs Lisp Reference Manual.
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/lispref/maps.texi b/lispref/maps.texi
index cdbd655eb3c..c4d065c355a 100644
--- a/lispref/maps.texi
+++ b/lispref/maps.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/maps
 @node Standard Keymaps, Standard Hooks, Standard Buffer-Local Variables, Top
diff --git a/lispref/markers.texi b/lispref/markers.texi
index c3fdddc6aab..e8e04479758 100644
--- a/lispref/markers.texi
+++ b/lispref/markers.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/markers
 @node Markers, Text, Positions, Top
diff --git a/lispref/minibuf.texi b/lispref/minibuf.texi
index d4f94e5269b..de81e94e54e 100644
--- a/lispref/minibuf.texi
+++ b/lispref/minibuf.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/minibuf
 @node Minibuffers, Command Loop, Read and Print, Top
diff --git a/lispref/modes.texi b/lispref/modes.texi
index b46c0c0e1a5..1d96568fc1d 100644
--- a/lispref/modes.texi
+++ b/lispref/modes.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/modes
 @node Modes, Documentation, Keymaps, Top
diff --git a/lispref/nonascii.texi b/lispref/nonascii.texi
index ba001ca72db..d733cc80860 100644
--- a/lispref/nonascii.texi
+++ b/lispref/nonascii.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/characters
 @node Non-ASCII Characters, Searching and Matching, Text, Top
diff --git a/lispref/numbers.texi b/lispref/numbers.texi
index fd730420cc6..6e54af3319c 100644
--- a/lispref/numbers.texi
+++ b/lispref/numbers.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/numbers
 @node Numbers, Strings and Characters, Lisp Data Types, Top
diff --git a/lispref/objects.texi b/lispref/objects.texi
index 519e93f2eb3..3fc11631111 100644
--- a/lispref/objects.texi
+++ b/lispref/objects.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/objects
 @node Lisp Data Types, Numbers, Introduction, Top
diff --git a/lispref/os.texi b/lispref/os.texi
index a36d921f7af..1ff0517891d 100644
--- a/lispref/os.texi
+++ b/lispref/os.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/os
 @node System Interface, Antinews, Display, Top
diff --git a/lispref/positions.texi b/lispref/positions.texi
index f37d885627d..993bc31511f 100644
--- a/lispref/positions.texi
+++ b/lispref/positions.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/positions
 @node Positions, Markers, Frames, Top
diff --git a/lispref/processes.texi b/lispref/processes.texi
index f4c3d495764..d914fd7f669 100644
--- a/lispref/processes.texi
+++ b/lispref/processes.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/processes
 @node Processes, Display, Abbrevs, Top
diff --git a/lispref/searching.texi b/lispref/searching.texi
index bc3fd9ce911..7fdbdb73d46 100644
--- a/lispref/searching.texi
+++ b/lispref/searching.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/searching
 @node Searching and Matching, Syntax Tables, Non-ASCII Characters, Top
diff --git a/lispref/sequences.texi b/lispref/sequences.texi
index 35cff43739d..8087b8051cb 100644
--- a/lispref/sequences.texi
+++ b/lispref/sequences.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/sequences
 @node Sequences Arrays Vectors, Hash Tables, Lists, Top
diff --git a/lispref/streams.texi b/lispref/streams.texi
index 4fad9a2a3cd..9bb66378e5f 100644
--- a/lispref/streams.texi
+++ b/lispref/streams.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1998, 1999, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/streams
 @node Read and Print, Minibuffers, Debugging, Top
diff --git a/lispref/strings.texi b/lispref/strings.texi
index 17a62b546b4..1be21ccd5ca 100644
--- a/lispref/strings.texi
+++ b/lispref/strings.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/strings
 @node Strings and Characters, Lists, Numbers, Top
diff --git a/lispref/symbols.texi b/lispref/symbols.texi
index a1b2b8855be..4cd4bd42594 100644
--- a/lispref/symbols.texi
+++ b/lispref/symbols.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/symbols
 @node Symbols, Evaluation, Hash Tables, Top
diff --git a/lispref/syntax.texi b/lispref/syntax.texi
index 4458547f7d2..5d7c76889a7 100644
--- a/lispref/syntax.texi
+++ b/lispref/syntax.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/syntax
 @node Syntax Tables, Abbrevs, Searching and Matching, Top
diff --git a/lispref/text.texi b/lispref/text.texi
index 8d513b7f6bd..11cf3cf2184 100644
--- a/lispref/text.texi
+++ b/lispref/text.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
 @c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/text
 @node Text, Non-ASCII Characters, Markers, Top
diff --git a/lispref/tindex.pl b/lispref/tindex.pl
index 6d9be40dfcb..73143ffa596 100755
--- a/lispref/tindex.pl
+++ b/lispref/tindex.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
-# Copyright (C) 2000, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/lispref/tips.texi b/lispref/tips.texi
index 3a74aa62716..5f4479a5fd3 100644
--- a/lispref/tips.texi
+++ b/lispref/tips.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1995, 1998, 1999, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/tips
 @node Tips, GNU Emacs Internals, GPL, Top
@@ -210,7 +210,8 @@ Constructs that define a function or variable should be macros,
 not functions, and their names should start with @samp{def}.
 
 @item
-Macros that define a functions or variables should take the name to be
+A macro that defines a function or variable should have a name that
+starts with @samp{define-}.  The macro should receive the name to be
 defined as the first argument.  That will help various tools find the
 definition automatically.  Avoid constructing the names in the macro
 itself, since that would confuse these tools.
diff --git a/lispref/variables.texi b/lispref/variables.texi
index a10a157af1b..7a2b2013b23 100644
--- a/lispref/variables.texi
+++ b/lispref/variables.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000,
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/variables
 @node Variables, Functions, Control Structures, Top
diff --git a/lispref/vol1.texi b/lispref/vol1.texi
index ac2958e9b09..9ac873bdcce 100644
--- a/lispref/vol1.texi
+++ b/lispref/vol1.texi
@@ -2,8 +2,8 @@ This file is obsolete, and no longer part of the Emacs Lisp Reference Manual.
 It is still present in CVS in case we ever want to use some of it again.
 
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 \input texinfo  @c -*-texinfo-*-
diff --git a/lispref/vol2.texi b/lispref/vol2.texi
index c59449d4eee..d21723be037 100644
--- a/lispref/vol2.texi
+++ b/lispref/vol2.texi
@@ -2,8 +2,8 @@ This file is obsolete, and no longer part of the Emacs Lisp Reference Manual.
 It is still present in CVS in case we ever want to use some of it again.
 
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 
 
diff --git a/lispref/windows.texi b/lispref/windows.texi
index bd9269f90ae..5f21b1977bd 100644
--- a/lispref/windows.texi
+++ b/lispref/windows.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
 @c This is part of the GNU Emacs Lisp Reference Manual.
-@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2001,
+@c   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See the file elisp.texi for copying conditions.
 @setfilename ../info/windows
 @node Windows, Frames, Buffers, Top
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index d3e8c2eb4c3..b8fc313228b 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1334,8 +1334,8 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2006
-        Free Software Foundation, Inc.
+    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
+	2005, 2006, 2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/lwlib/lwlib-Xlw.c b/lwlib/lwlib-Xlw.c
index dd366e4cca1..7fbf8bd5f07 100644
--- a/lwlib/lwlib-Xlw.c
+++ b/lwlib/lwlib-Xlw.c
@@ -1,7 +1,7 @@
 /* The lwlib interface to "xlwmenu" menus.
    Copyright (C) 1992 Lucid, Inc.
    Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/lwlib-Xm.c b/lwlib/lwlib-Xm.c
index 78ad165ef0e..f15bbdf7b39 100644
--- a/lwlib/lwlib-Xm.c
+++ b/lwlib/lwlib-Xm.c
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
    Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/lwlib-Xm.h b/lwlib/lwlib-Xm.h
index 74eea3d4d79..92112a1f946 100644
--- a/lwlib/lwlib-Xm.h
+++ b/lwlib/lwlib-Xm.h
@@ -1,6 +1,6 @@
 /* The lwlib interface to Motif widgets.
-   Copyright (C) 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1992 Lucid, Inc.
 
 This file is part of the Lucid Widget Library.
diff --git a/lwlib/xlwmenu.c b/lwlib/xlwmenu.c
index 65b9685038e..bdd2194d500 100644
--- a/lwlib/xlwmenu.c
+++ b/lwlib/xlwmenu.c
@@ -1,6 +1,6 @@
 /* Implements a lightweight menubar widget.
    Copyright (C) 1992 Lucid, Inc.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenu.h b/lwlib/xlwmenu.h
index 9b7a6b099db..f14ffd72dab 100644
--- a/lwlib/xlwmenu.h
+++ b/lwlib/xlwmenu.h
@@ -1,6 +1,6 @@
 /* Interface of a lightweight menubar widget.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/lwlib/xlwmenuP.h b/lwlib/xlwmenuP.h
index b90bc3da827..7ad135ac7b7 100644
--- a/lwlib/xlwmenuP.h
+++ b/lwlib/xlwmenuP.h
@@ -1,6 +1,6 @@
 /* Internals of a lightweight menubar widget.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004, 
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of the Lucid Widget Library.
 
diff --git a/m4/getopt.m4 b/m4/getopt.m4
index a0c6ea38cf5..75cccacc2f2 100644
--- a/m4/getopt.m4
+++ b/m4/getopt.m4
@@ -1,5 +1,5 @@
 # getopt.m4 serial 10
-dnl Copyright (C) 2002,2003,2004,2005,2006 Free Software Foundation, Inc.
+dnl Copyright (C) 2002,2003,2004,2005,2006,2007 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
diff --git a/mac/ChangeLog b/mac/ChangeLog
index 225d953dfc4..228616ba439 100644
--- a/mac/ChangeLog
+++ b/mac/ChangeLog
@@ -868,7 +868,7 @@
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-	2006 Free Software Foundation, Inc.
+	2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/mac/Emacs.app/Contents/Info.plist b/mac/Emacs.app/Contents/Info.plist
index d03123cc3cd..c27500678b8 100644
--- a/mac/Emacs.app/Contents/Info.plist
+++ b/mac/Emacs.app/Contents/Info.plist
@@ -1,3 +1,25 @@
+<!--
+Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007
+  Free Software Foundation, Inc.
+
+This file is part of GNU Emacs.
+
+GNU Emacs is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+GNU Emacs is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GNU Emacs; see the file COPYING.  If not, write to the Free
+Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+MA 02110-1301, USA.
+-->
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
 <plist version="0.9">
diff --git a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
index 88098f4728f..fec519b516e 100644
--- a/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
+++ b/mac/Emacs.app/Contents/Resources/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
 /* Localized versions of Info.plist keys */
 
 CFBundleName = "Emacs";
-CFBundleShortVersionString = "22.0.92";
-CFBundleGetInfoString = "22.0.92, Copyright (C) 2006 Free Software Foundation, Inc.";
+CFBundleShortVersionString = "22.0.93";
+CFBundleGetInfoString = "22.0.93, Copyright (C) 2007 Free Software Foundation, Inc.";
diff --git a/mac/INSTALL b/mac/INSTALL
index de9e76071c4..35455bb030d 100644
--- a/mac/INSTALL
+++ b/mac/INSTALL
@@ -1,7 +1,7 @@
 * BUILDING EMACS ON MAC OS Classic AND MAC OS X     -*- outline -*-
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/mac/README b/mac/README
index ecbd438a3f6..419ba75b043 100644
--- a/mac/README
+++ b/mac/README
@@ -1,7 +1,7 @@
 Emacs for Mac OS Classic and Mac OS X
 
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim
    copies of this document as received, in any medium, provided that
diff --git a/mac/cw6-mcp.xml b/mac/cw6-mcp.xml
index c05a57d0b53..38f12ba2e74 100644
--- a/mac/cw6-mcp.xml
+++ b/mac/cw6-mcp.xml
@@ -1,6 +1,6 @@
 <!--
 Copyright (C) 2001, 2002, 2003, 2004, 2005,
-   2006 Free Software Foundation, Inc.
+   2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/alloca.h b/mac/inc/alloca.h
index 851089b3dac..9ce323d0f77 100644
--- a/mac/inc/alloca.h
+++ b/mac/inc/alloca.h
@@ -1,5 +1,5 @@
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+      2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/config.h b/mac/inc/config.h
index 3dd38a2913d..3f1aa1ed941 100644
--- a/mac/inc/config.h
+++ b/mac/inc/config.h
@@ -1,8 +1,8 @@
 /* Handcrafted Emacs site configuration file for Mac OS 9.  -*- C -*- */
 
 /* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/defs-cw6.h b/mac/inc/defs-cw6.h
index d4e309ebea7..e72cd9e5f73 100644
--- a/mac/inc/defs-cw6.h
+++ b/mac/inc/defs-cw6.h
@@ -1,5 +1,5 @@
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+      2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/dirent.h b/mac/inc/dirent.h
index da7b30085dc..40ec3467081 100644
--- a/mac/inc/dirent.h
+++ b/mac/inc/dirent.h
@@ -1,6 +1,6 @@
 /* Replacement dirent.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/epaths.h b/mac/inc/epaths.h
index 8d0539404f4..2c29f98f5c8 100644
--- a/mac/inc/epaths.h
+++ b/mac/inc/epaths.h
@@ -1,8 +1,8 @@
 /* Hey Emacs, this is -*- C -*- code!  */
 
 /* Handcrafted epaths.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/grp.h b/mac/inc/grp.h
index 90bb12a4078..b4311f5ee1c 100755
--- a/mac/inc/grp.h
+++ b/mac/inc/grp.h
@@ -1,5 +1,5 @@
 /* Replacement grp.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/m-mac.h b/mac/inc/m-mac.h
index a9a3fc3cd17..544e5d0187d 100644
--- a/mac/inc/m-mac.h
+++ b/mac/inc/m-mac.h
@@ -1,6 +1,6 @@
 /* Handcrafted m-mac.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/pwd.h b/mac/inc/pwd.h
index 17fcc8ff6ba..239b915430b 100644
--- a/mac/inc/pwd.h
+++ b/mac/inc/pwd.h
@@ -1,6 +1,6 @@
 /* Replacement pwd.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/s-mac.h b/mac/inc/s-mac.h
index de1f573438a..83715a7ea06 100644
--- a/mac/inc/s-mac.h
+++ b/mac/inc/s-mac.h
@@ -1,6 +1,6 @@
 /* Handcrafted s-mac.h file for building GNU Emacs on Mac OS 9.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/file.h b/mac/inc/sys/file.h
index 508a89869a6..4b320eaea2f 100644
--- a/mac/inc/sys/file.h
+++ b/mac/inc/sys/file.h
@@ -1,6 +1,6 @@
 /* Replacement sys/file.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/ioctl.h b/mac/inc/sys/ioctl.h
index 22335db7c38..e2fca68f021 100644
--- a/mac/inc/sys/ioctl.h
+++ b/mac/inc/sys/ioctl.h
@@ -1,6 +1,6 @@
 /* Replacement sys/ioctl.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/param.h b/mac/inc/sys/param.h
index 28f8f1e9d2c..b4f93fa924e 100644
--- a/mac/inc/sys/param.h
+++ b/mac/inc/sys/param.h
@@ -1,6 +1,6 @@
 /* Replacement sys/param.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/stat.h b/mac/inc/sys/stat.h
index dd99df5fda2..4a9cd5fcdc1 100644
--- a/mac/inc/sys/stat.h
+++ b/mac/inc/sys/stat.h
@@ -1,6 +1,6 @@
 /* Replacement sys/stat.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/time.h b/mac/inc/sys/time.h
index e584cb89ff7..14579bea4e4 100644
--- a/mac/inc/sys/time.h
+++ b/mac/inc/sys/time.h
@@ -1,6 +1,6 @@
 /* Replacement sys/time.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/sys/types.h b/mac/inc/sys/types.h
index 34f3cbca87f..27c85643124 100644
--- a/mac/inc/sys/types.h
+++ b/mac/inc/sys/types.h
@@ -1,6 +1,6 @@
 /* Replacement sys/types.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/termio.h b/mac/inc/termio.h
index fe1dd8ed945..26f4d0a975a 100644
--- a/mac/inc/termio.h
+++ b/mac/inc/termio.h
@@ -1,6 +1,6 @@
 /* Replacement termio.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utime.h b/mac/inc/utime.h
index 3a7456ee78e..66fb3cf3afd 100644
--- a/mac/inc/utime.h
+++ b/mac/inc/utime.h
@@ -1,6 +1,6 @@
 /* Replacement utime.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/inc/utsname.h b/mac/inc/utsname.h
index e0c32e1c1ae..e34e2ebbd1b 100644
--- a/mac/inc/utsname.h
+++ b/mac/inc/utsname.h
@@ -1,6 +1,6 @@
 /* Replacement utsname.h file for building GNU Emacs on the Macintosh.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/make-package b/mac/make-package
index 26663f8eccf..2c113edbd13 100755
--- a/mac/make-package
+++ b/mac/make-package
@@ -18,7 +18,7 @@
 ####     files inside /usr.  This will replace the default version of
 ####     emacs included with Mac OS X.
 
-# Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/mac/makefile.MPW b/mac/makefile.MPW
index 7f4c043604e..741a8e124d7 100644
--- a/mac/makefile.MPW
+++ b/mac/makefile.MPW
@@ -1,6 +1,6 @@
 #    Make file for building GNU Emacs on the Macintosh.
-#    Copyright (C) 1999, 2000, 2002, 2003, 2004,
-#       2005, 2006 Free Software Foundation, Inc.
+#    Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+#       2005, 2006, 2007  Free Software Foundation, Inc.
 #
 #    Author: Andrew Choi <akochoi@users.sourceforge.net>
 #
diff --git a/mac/src/Emacs.r b/mac/src/Emacs.r
index 37d6d0f7c39..a1a11abef06 100644
--- a/mac/src/Emacs.r
+++ b/mac/src/Emacs.r
@@ -1,6 +1,6 @@
 /* Resource definitions for GNU Emacs on the Macintosh.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -221,10 +221,10 @@ resource 'vers' (1) {
 	0x22,		/* Major revision in BCD */
 	0x0,		/* Minor revision in BCD */
 	alpha,	/* development, alpha, beta, or final (release) */
-	92,		/* Non-final release # */
+	93,		/* Non-final release # */
 	0,		/* Region code */
-	"22.0.92",	/* Short version number */
-	"22.0.92, Copyright \0xa9 2006 "
+	"22.0.93",	/* Short version number */
+	"22.0.93, Copyright \0xa9 2007 "
 	"Free Software Foundation, Inc." /* Long version number */
 };
 
diff --git a/mac/src/EmacsMPW.r b/mac/src/EmacsMPW.r
index 113524e6d3f..4d6faa25a84 100644
--- a/mac/src/EmacsMPW.r
+++ b/mac/src/EmacsMPW.r
@@ -1,8 +1,8 @@
 /* Resource definitions for GNU Emacs on the Macintosh when building
    under MPW.
 
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/mac/src/chdir.c b/mac/src/chdir.c
index 324fdd801b2..e1b112c7bf4 100644
--- a/mac/src/chdir.c
+++ b/mac/src/chdir.c
@@ -1,6 +1,6 @@
 /* Implementation of chdir on the Mac for use with make-docfile.
-   Copyright (C) 1999, 2000, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/make-dist b/make-dist
index efa33efcba8..1781746f75c 100755
--- a/make-dist
+++ b/make-dist
@@ -7,7 +7,7 @@
 #### you should make sure that this script will include it.
 
 # Copyright (C) 1995, 1997, 1998, 2000, 2001, 2002, 2003, 2004, 2005,
-#   2006  Free Software Foundation, Inc.
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/man/ChangeLog b/man/ChangeLog
index 342bafa4e6b..44a02efe937 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,25 @@
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* msdog.texi (ls in Lisp): Document ls-lisp-format-time-list and
+	ls-lisp-use-localized-time-format.
+
+2007-01-20  Markus Triska  <markus.triska@gmx.at>
+
+	* flymake.texi (Flymake mode): find-file-hook instead of ...-hooks.
+
+2007-01-13  Michael Olson  <mwolson@gnu.org>
+
+	* erc.texi (Modules): Mention capab-identify module.
+
+2007-01-16  Glenn Morris  <rgm@gnu.org>
+
+	* abbrevs.texi (Editing Abbrevs): Describe how to disable a system
+	abbrev.
+
+2007-01-11  Richard Stallman  <rms@gnu.org>
+
+	* msdog.texi (Windows Keyboard): Another small cleanup.
+
 2007-01-10  Richard Stallman  <rms@gnu.org>
 
 	* msdog.texi (Windows Keyboard): Yet another try to make
@@ -7470,7 +7492,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002,
-      2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+      2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/man/Makefile.in b/man/Makefile.in
index 5008cfbc593..9810bf27fa5 100644
--- a/man/Makefile.in
+++ b/man/Makefile.in
@@ -1,7 +1,7 @@
 #### Makefile for the Emacs Manual and other documentation.
 
 # Copyright (C) 1994, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-#   2004, 2005, 2006 Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/man/abbrevs.texi b/man/abbrevs.texi
index bea460a9a61..585e28318e7 100644
--- a/man/abbrevs.texi
+++ b/man/abbrevs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Abbrevs
 @chapter Abbrevs
@@ -258,6 +258,8 @@ the end of the line is the expansion.
   Some abbrevs are marked with @samp{(sys)}.  These ``system'' abbrevs
 (@pxref{Abbrevs,,, elisp, The Emacs Lisp Reference Manual}) are
 pre-defined by various modes, and are not saved to your abbrev file.
+To disable a ``system'' abbrev, define an abbrev of the same name that
+expands to itself, and save it to your abbrev file.
 
 @findex edit-abbrevs
 @kindex C-c C-c @r{(Edit Abbrevs)}
diff --git a/man/ack.texi b/man/ack.texi
index 8d0b20f52f8..fecaf37cb15 100644
--- a/man/ack.texi
+++ b/man/ack.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @node Acknowledgments, Screen, Concept Index, Top
diff --git a/man/ada-mode.texi b/man/ada-mode.texi
index 9d25370826e..7acae36c74f 100644
--- a/man/ada-mode.texi
+++ b/man/ada-mode.texi
@@ -4,7 +4,7 @@
 
 @copying
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/anti.texi b/man/anti.texi
index f5d1e420d5f..a0003c012db 100644
--- a/man/anti.texi
+++ b/man/anti.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 
 @node Antinews, Mac OS, X Resources, Top
diff --git a/man/arevert-xtra.texi b/man/arevert-xtra.texi
index 8a207cc63cf..c2b1ddc2ffe 100644
--- a/man/arevert-xtra.texi
+++ b/man/arevert-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/autotype.texi b/man/autotype.texi
index 9d707e33243..a462b7a97a2 100644
--- a/man/autotype.texi
+++ b/man/autotype.texi
@@ -1,7 +1,7 @@
 \input texinfo
 @c This is an annex of the Emacs manual.
-@c Copyright (C) 1994, 1995, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @c Author: Daniel.Pfeiffer@Informatik.START.dbp.de, fax (+49 69) 7588-2389
 @setfilename ../info/autotype
 @c @node Autotypist, Picture, Abbrevs, Top
@@ -12,8 +12,8 @@
 @c  @cindex autotypist
 
 @copying
-Copyright @copyright{} 1994, 1995, 1999, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1994, 1995, 1999, 2001, 2002, 2003, 2004,
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/basic.texi b/man/basic.texi
index 5d91685e9e4..6d19281b089 100644
--- a/man/basic.texi
+++ b/man/basic.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Basic, Minibuffer, Exiting, Top
 @chapter Basic Editing Commands
diff --git a/man/buffers.texi b/man/buffers.texi
index 8ff76e2f519..ed4b855b684 100644
--- a/man/buffers.texi
+++ b/man/buffers.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Buffers, Windows, Files, Top
 @chapter Using Multiple Buffers
diff --git a/man/building.texi b/man/building.texi
index 67f21dd9c23..a25e1bf4e06 100644
--- a/man/building.texi
+++ b/man/building.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Building, Maintaining, Programs, Top
 @chapter Compiling and Testing Programs
diff --git a/man/cal-xtra.texi b/man/cal-xtra.texi
index 3214474533e..5212fceef57 100644
--- a/man/cal-xtra.texi
+++ b/man/cal-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/calc.texi b/man/calc.texi
index d38becd46d9..ca7167905cb 100644
--- a/man/calc.texi
+++ b/man/calc.texi
@@ -84,7 +84,7 @@
 This file documents Calc, the GNU Emacs calculator.
 
 Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -120,7 +120,7 @@ Software Foundation raise funds for GNU development.''
 
 @vskip 0pt plus 1filll
 Copyright @copyright{} 1990, 1991, 2001, 2002, 2003, 2004,
-   2005, 2006 Free Software Foundation, Inc.
+   2005, 2006, 2007 Free Software Foundation, Inc.
 @insertcopying
 @end titlepage
 
diff --git a/man/calendar.texi b/man/calendar.texi
index 45aec25be9b..812bde03b2f 100644
--- a/man/calendar.texi
+++ b/man/calendar.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Calendar/Diary, Gnus, Dired, Top
 @chapter The Calendar and the Diary
diff --git a/man/cc-mode.texi b/man/cc-mode.texi
index e9a7d46d7fe..05b7df18b47 100644
--- a/man/cc-mode.texi
+++ b/man/cc-mode.texi
@@ -160,7 +160,7 @@ CC Mode
 This manual is for CC Mode in Emacs.
 
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/cl.texi b/man/cl.texi
index 2c357f5fec6..6a6663fcd5b 100644
--- a/man/cl.texi
+++ b/man/cl.texi
@@ -5,8 +5,8 @@
 @copying
 This file documents the GNU Emacs Common Lisp emulation package.
 
-Copyright @copyright{} 1993, 2002, 2003, 2004, 2005, 2006 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index f664c3144ce..6586f304bc4 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Emacs Invocation, X Resources, GNU Free Documentation License, Top
 @appendix Command Line Arguments for Emacs Invocation
diff --git a/man/commands.texi b/man/commands.texi
index 1f67a671fbe..d2daffe00bb 100644
--- a/man/commands.texi
+++ b/man/commands.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Characters, Keys and Commands
diff --git a/man/custom.texi b/man/custom.texi
index d14ea2fcd46..40eefba1ba3 100644
--- a/man/custom.texi
+++ b/man/custom.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Customization, Quitting, Amusements, Top
 @chapter Customization
diff --git a/man/dired-x.texi b/man/dired-x.texi
index 7a53e5a6816..0d9e385b789 100644
--- a/man/dired-x.texi
+++ b/man/dired-x.texi
@@ -29,7 +29,7 @@ This documents the ``extra'' features for Dired Mode for GNU Emacs found in
 the file @file{dired-x.el}.
 
 Copyright @copyright{} 1993, 1994, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to make and distribute verbatim copies of this
diff --git a/man/dired-xtra.texi b/man/dired-xtra.texi
index 01d6963c582..e8fdf8ab468 100644
--- a/man/dired-xtra.texi
+++ b/man/dired-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/dired.texi b/man/dired.texi
index 0281c6b0107..c40030147b4 100644
--- a/man/dired.texi
+++ b/man/dired.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Dired, Calendar/Diary, Rmail, Top
 @chapter Dired, the Directory Editor
diff --git a/man/display.texi b/man/display.texi
index 73d91dfb1f2..805a39f8444 100644
--- a/man/display.texi
+++ b/man/display.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Display, Search, Registers, Top
 @chapter Controlling the Display
diff --git a/man/ebrowse.texi b/man/ebrowse.texi
index 1f4943645c9..25262625e92 100644
--- a/man/ebrowse.texi
+++ b/man/ebrowse.texi
@@ -10,8 +10,8 @@
 @copying
 This file documents Ebrowse, a C++ class browser for GNU Emacs.
 
-Copyright @copyright{} 2000, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/ediff.texi b/man/ediff.texi
index 7a4c929a0eb..52823cdb8fb 100644
--- a/man/ediff.texi
+++ b/man/ediff.texi
@@ -26,7 +26,7 @@ This file documents Ediff, a comprehensive visual interface to Unix diff
 and patch utilities.
 
 Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs-mime.texi b/man/emacs-mime.texi
index 9ce7e168dcf..c4fa9aa6879 100644
--- a/man/emacs-mime.texi
+++ b/man/emacs-mime.texi
@@ -10,7 +10,7 @@
 This file documents the Emacs MIME interface functionality.
 
 Copyright @copyright{} 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs-xtra.texi b/man/emacs-xtra.texi
index 2a6f0e73c02..841c62a527f 100644
--- a/man/emacs-xtra.texi
+++ b/man/emacs-xtra.texi
@@ -10,7 +10,7 @@
 @copying
 This manual describes specialized features of Emacs.
 
-Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/emacs.texi b/man/emacs.texi
index d8bb5e8d5dc..07c003c3a29 100644
--- a/man/emacs.texi
+++ b/man/emacs.texi
@@ -5,14 +5,14 @@
 
 @c The edition number appears in several places in this file
 @set EDITION   Sixteenth
-@set EMACSVER  22.0.92
+@set EMACSVER  22.0.93
 
 @copying
 This is the @value{EDITION} edition of the @cite{GNU Emacs Manual},
 updated for Emacs version @value{EMACSVER}.
 
 Copyright @copyright{} 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 Foundation, Inc.
 
 @quotation
diff --git a/man/emerge-xtra.texi b/man/emerge-xtra.texi
index 3b5fe7cd17f..e78f17e59d6 100644
--- a/man/emerge-xtra.texi
+++ b/man/emerge-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/entering.texi b/man/entering.texi
index 3be5e6a19dd..e338a6a8619 100644
--- a/man/entering.texi
+++ b/man/entering.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 2001, 2002, 2003,
+@c   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Entering Emacs, Exiting, Text Characters, Top
 @chapter Entering and Exiting Emacs
diff --git a/man/erc.texi b/man/erc.texi
index da18618ecda..60c682b892f 100644
--- a/man/erc.texi
+++ b/man/erc.texi
@@ -14,7 +14,7 @@
 @copying
 This manual is for ERC version 5.2 stable pre-release.
 
-Copyright @copyright{} 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -406,6 +406,10 @@ Integrate with the Big Brother Database
 @item button
 Buttonize URLs, nicknames, and other text
 
+@cindex modules, capab-identify
+@item capab-identify
+Mark unidentified users on freenode and other servers supporting CAPAB.
+
 @cindex modules, completion
 @item pcomplete
 Complete nicknames and commands (programmable)
diff --git a/man/eshell.texi b/man/eshell.texi
index ea603daee7f..68ca49ee440 100644
--- a/man/eshell.texi
+++ b/man/eshell.texi
@@ -9,7 +9,7 @@
 This manual is for Eshell, the Emacs shell.
 
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/eudc.texi b/man/eudc.texi
index b23cada3ac8..08c02131f3e 100644
--- a/man/eudc.texi
+++ b/man/eudc.texi
@@ -12,7 +12,7 @@ EUDC is the Emacs Unified Directory Client, a common interface to
 directory servers using various protocols such as LDAP or the CCSO white
 pages directory system (PH/QI)
 
-Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Copyright @copyright{} 1998, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 Free Software Foundation, Inc.
 
 @quotation
diff --git a/man/faq.texi b/man/faq.texi
index 5ba47325271..35288593ad0 100644
--- a/man/faq.texi
+++ b/man/faq.texi
@@ -14,8 +14,8 @@
 @c appreciate a notice if you do).
 
 @copying
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
-Software Foundation, Inc.@*
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.@*
 Copyright 1994,1995,1996,1997,1998,1999,2000 Reuven M. Lerner@*
 Copyright 1992,1993 Steven Byrnes@*
 Copyright 1990,1991,1992 Joseph Brian Wells@*
diff --git a/man/files.texi b/man/files.texi
index 86e3282e542..531d50f6392 100644
--- a/man/files.texi
+++ b/man/files.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Files, Buffers, Keyboard Macros, Top
 @chapter File Handling
diff --git a/man/fixit.texi b/man/fixit.texi
index 1d7c1b6eb41..d1577e2f528 100644
--- a/man/fixit.texi
+++ b/man/fixit.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Fixit, Keyboard Macros, Search, Top
 @chapter Commands for Fixing Typos
diff --git a/man/flymake.texi b/man/flymake.texi
index 3861fe70812..4d6b8303f4a 100644
--- a/man/flymake.texi
+++ b/man/flymake.texi
@@ -11,7 +11,7 @@
 This manual is for GNU Flymake (version @value{VERSION}, @value{UPDATED}),
 which is a universal on-the-fly syntax checker for GNU Emacs.
 
-Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
@@ -155,7 +155,7 @@ file for which syntax check is possible. To do so, place the following
 line in @code{.emacs}:
 
 @lisp
-(add-hook 'find-file-hooks 'flymake-find-file-hook)
+(add-hook 'find-file-hook 'flymake-find-file-hook)
 @end lisp
 
 @node Running the syntax check
diff --git a/man/forms.texi b/man/forms.texi
index be78380335e..46210dc8e41 100644
--- a/man/forms.texi
+++ b/man/forms.texi
@@ -19,7 +19,7 @@
 This file documents Forms mode, a form-editing major mode for GNU Emacs.
 
 Copyright @copyright{} 1989, 1997, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/fortran-xtra.texi b/man/fortran-xtra.texi
index 735404a0bf4..9249f5f006c 100644
--- a/man/fortran-xtra.texi
+++ b/man/fortran-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/frames.texi b/man/frames.texi
index 7d8fdbfd0ce..d315a61aedb 100644
--- a/man/frames.texi
+++ b/man/frames.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Frames, International, Windows, Top
 @chapter Frames and Graphical Displays
diff --git a/man/glossary.texi b/man/glossary.texi
index 02611790bee..2a55b49645b 100644
--- a/man/glossary.texi
+++ b/man/glossary.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Glossary, Key Index, Intro, Top
 @unnumbered Glossary
diff --git a/man/gnu.texi b/man/gnu.texi
index 27fe2e24953..3b8a8e17f0a 100644
--- a/man/gnu.texi
+++ b/man/gnu.texi
@@ -1,13 +1,13 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1995, 2001, 2002, 2003, 2004,
+@c   2005, 2006, 2007  Free Software Foundation, Inc.
 @ifclear justgnu
 @node Manifesto,, Microsoft Windows, Top
 @unnumbered The GNU Manifesto
 @end ifclear
 @ifset justgnu
 Copyright @copyright{} 1985, 1993, 2001, 2002, 2003, 2004,
-2005 Free Software Foundation, Inc.
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/man/gnus-faq.texi b/man/gnus-faq.texi
index 861bab438d6..093cb4c289b 100644
--- a/man/gnus-faq.texi
+++ b/man/gnus-faq.texi
@@ -1,7 +1,7 @@
 @c \input texinfo @c -*-texinfo-*-
 @c Uncomment 1st line before texing this file alone.
 @c %**start of header
-@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c
 @c Do not modify this file, it was generated from gnus-faq.xml, available from
 @c <URL:http://my.gnus.org/FAQ/>.
diff --git a/man/gnus.texi b/man/gnus.texi
index b7e453e83cf..80a9e47c74b 100644
--- a/man/gnus.texi
+++ b/man/gnus.texi
@@ -8,7 +8,7 @@
 
 @copying
 Copyright @copyright{} 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/help.texi b/man/help.texi
index 08f528f5151..fe7c2a85ffa 100644
--- a/man/help.texi
+++ b/man/help.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Help, Mark, M-x, Top
 @chapter Help
diff --git a/man/idlwave.texi b/man/idlwave.texi
index eb2f8619ad0..49ee0b7a110 100644
--- a/man/idlwave.texi
+++ b/man/idlwave.texi
@@ -30,7 +30,7 @@ This is edition @value{EDITION} of the IDLWAVE User Manual for IDLWAVE
 @value{VERSION}
 
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
-          2006 Free Software Foundation, Inc.
+          2006, 2007 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -61,7 +61,7 @@ This is edition @value{EDITION} of the @cite{IDLWAVE User Manual} for
 IDLWAVE version @value{VERSION}, @value{DATE}.
 @sp 2
 Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
-          2006 Free Software Foundation, Inc.
+          2006, 2007 Free Software Foundation, Inc.
 @sp 2
 @cindex Copyright, of IDLWAVE
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/indent.texi b/man/indent.texi
index 9462b1b3fac..568b54897fa 100644
--- a/man/indent.texi
+++ b/man/indent.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Indentation, Text, Major Modes, Top
 @chapter Indentation
diff --git a/man/info.texi b/man/info.texi
index adefd0f2e4a..1781ca0b3ea 100644
--- a/man/info.texi
+++ b/man/info.texi
@@ -15,7 +15,7 @@ This file describes how to use Info, the on-line, menu-driven GNU
 documentation system.
 
 Copyright @copyright{} 1989, 1992, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/killing.texi b/man/killing.texi
index 396a76328aa..b853d69a04a 100644
--- a/man/killing.texi
+++ b/man/killing.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 
 @node Killing, Yanking, Mark, Top
diff --git a/man/kmacro.texi b/man/kmacro.texi
index 6596adf4268..16526e1a2b8 100644
--- a/man/kmacro.texi
+++ b/man/kmacro.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Keyboard Macros, Files, Fixit, Top
 @chapter Keyboard Macros
diff --git a/man/m-x.texi b/man/m-x.texi
index a387f878695..7a5b80fd348 100644
--- a/man/m-x.texi
+++ b/man/m-x.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node M-x, Help, Minibuffer, Top
 @chapter Running Commands by Name
diff --git a/man/macos.texi b/man/macos.texi
index d097b32bd38..0671b8c5f74 100644
--- a/man/macos.texi
+++ b/man/macos.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 2000, 2001, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c   2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mac OS, Microsoft Windows, Antinews, Top
 @appendix Emacs and Mac OS
diff --git a/man/maintaining.texi b/man/maintaining.texi
index facde7020bc..d199cac69bb 100644
--- a/man/maintaining.texi
+++ b/man/maintaining.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Maintaining, Abbrevs, Building, Top
 @chapter Maintaining Large Programs
diff --git a/man/major.texi b/man/major.texi
index fe9416aacde..1cb76ee5fdf 100644
--- a/man/major.texi
+++ b/man/major.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Major Modes, Indentation, International, Top
 @chapter Major Modes
diff --git a/man/makefile.w32-in b/man/makefile.w32-in
index f47c57158fc..0112040ee51 100644
--- a/man/makefile.w32-in
+++ b/man/makefile.w32-in
@@ -1,6 +1,6 @@
 #### -*- Makefile -*- for the Emacs Manual and other documentation.
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/man/mark.texi b/man/mark.texi
index 7cba4f0d004..be446ab6bfc 100644
--- a/man/mark.texi
+++ b/man/mark.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Mark, Killing, Help, Top
 @chapter The Mark and the Region
diff --git a/man/message.texi b/man/message.texi
index 86137c84d56..f63673e11da 100644
--- a/man/message.texi
+++ b/man/message.texi
@@ -9,7 +9,7 @@
 This file documents Message, the Emacs message composition mode.
 
 Copyright @copyright{} 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
-2004, 2005, 2006 Free Software Foundation, Inc.
+2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/mh-e.texi b/man/mh-e.texi
index dfe9ab0f6d5..707e5e44b98 100644
--- a/man/mh-e.texi
+++ b/man/mh-e.texi
@@ -24,7 +24,7 @@
 This is version @value{VERSION}@value{EDITION} of @cite{The MH-E
 Manual}, last updated @value{UPDATED}.
 
-Copyright @copyright{} 1995, 2001, 2002, 2003, 2005, 2006 Free
+Copyright @copyright{} 1995, 2001, 2002, 2003, 2005, 2006, 2007 Free
 Software Foundation, Inc.
 
 @quotation
diff --git a/man/mini.texi b/man/mini.texi
index af2a0778bb1..b57e79420b6 100644
--- a/man/mini.texi
+++ b/man/mini.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Minibuffer, M-x, Basic, Top
 @chapter The Minibuffer
diff --git a/man/misc.texi b/man/misc.texi
index 76e2693cded..bfe86af09f4 100644
--- a/man/misc.texi
+++ b/man/misc.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Miscellaneous Commands
diff --git a/man/msdog-xtra.texi b/man/msdog-xtra.texi
index 1c4e50785f2..432f28888f6 100644
--- a/man/msdog-xtra.texi
+++ b/man/msdog-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/msdog.texi b/man/msdog.texi
index 4f1711ff9ea..0ed15229b7c 100644
--- a/man/msdog.texi
+++ b/man/msdog.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Microsoft Windows, Manifesto, Mac OS, Top
 @appendix Emacs and Microsoft Windows/MS-DOS
@@ -280,6 +280,37 @@ restart Emacs, since @file{ls-lisp.el} is preloaded.
 file-name patterns are supported: if it is non-@code{nil} (the
 default), they are treated as shell-style wildcards; otherwise they
 are treated as Emacs regular expressions.
+
+@vindex ls-lisp-format-time-list
+  The variable @code{ls-lisp-format-time-list} defines how to format
+the date and time of files.  @emph{The value of this variable is
+ignored}, unless Emacs cannot determine the current locale.  (However,
+if the value of @code{ls-lisp-use-localized-time-format} is
+non-@code{nil}, Emacs obeys @code{ls-lisp-format-time-list} even if
+the current locale is available; see below.)
+
+The value of @code{ls-lisp-format-time-list} is a list of 2 strings.
+The first string is used if the file was modified within the current
+year, while the second string is used for older files.  In each of
+these two strings you can use @samp{%}-sequences to substitute parts
+of the time.  For example:
+@lisp
+("%b %e %H:%M" "%b %e  %Y")
+@end lisp
+
+@noindent
+Note that the strings substituted for these @samp{%}-sequences depend
+on the current locale.  @xref{Time Parsing,,, elisp, The Emacs Lisp
+Reference Manual}, for more about format time specs.
+
+@vindex ls-lisp-use-localized-time-format
+  Normally, Emacs formats the file time stamps in either traditional
+or ISO-style time format.  However, if the value of the variable
+@code{ls-lisp-use-localized-time-format} is non-@code{nil}, Emacs
+formats file time stamps according to what
+@code{ls-lisp-format-time-list} specifies.  The @samp{%}-sequences in
+@code{ls-lisp-format-time-list} produce locale-dependent month and day
+names, which might cause misalignment of columns in Dired display.
 @end ifnottex
 
 @node Windows HOME
@@ -336,12 +367,11 @@ keyboard input in Emacs.
 @cindex MS-Windows keyboard shortcuts
   Many key combinations (known as ``keyboard shortcuts'') that have
 conventional uses in MS-Windows programs conflict with traditional
-Emacs commands.  (These Emacs commands were established years before
-MS-Windows, and years before Microsoft.)  Examples of conflicts
-include @kbd{C-c}, @kbd{C-x}, @kbd{C-z}, @kbd{C-a}, and
-@kbd{W-@key{SPC}}.  You can redefine some of them with meanings more
-like the MS-Windows meanings by enabling CUA Mode (@pxref{CUA
-Bindings}).
+Emacs key bindings.  (These Emacs key bindings were established years
+before Microsoft was founded.)  Examples of conflicts include
+@kbd{C-c}, @kbd{C-x}, @kbd{C-z}, @kbd{C-a}, and @kbd{W-@key{SPC}}.
+You can redefine some of them with meanings more like the MS-Windows
+meanings by enabling CUA Mode (@pxref{CUA Bindings}).
 
 @kindex F10 @r{(MS-Windows)}
 @cindex menu bar access using keyboard @r{(MS-Windows)}
diff --git a/man/mule.texi b/man/mule.texi
index 3e7a35d246a..9369fcaca23 100644
--- a/man/mule.texi
+++ b/man/mule.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-@c   2005, 2006 Free Software Foundation, Inc.
+@c   2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node International, Major Modes, Frames, Top
 @chapter International Character Set Support
diff --git a/man/newsticker.texi b/man/newsticker.texi
index ed753147e22..95934792a02 100644
--- a/man/newsticker.texi
+++ b/man/newsticker.texi
@@ -13,7 +13,7 @@
 This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}).
 
 @noindent
-Copyright @copyright{} 2004, 2005, 2006  Free Software Foundation, Inc.
+Copyright @copyright{} 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/org.texi b/man/org.texi
index db8f20c3926..f47e559a372 100644
--- a/man/org.texi
+++ b/man/org.texi
@@ -35,7 +35,7 @@
 @copying
 This manual is for Org-mode (version @value{VERSION}).
 
-Copyright @copyright{} 2004, 2005, 2006 Free Software Foundation
+Copyright @copyright{} 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/pcl-cvs.texi b/man/pcl-cvs.texi
index 5faccf37594..813d1f95799 100644
--- a/man/pcl-cvs.texi
+++ b/man/pcl-cvs.texi
@@ -7,7 +7,8 @@
 
 @copying
 Copyright @copyright{} 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
-1999, 2000, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/pgg.texi b/man/pgg.texi
index af97ddec45d..74461ae90d8 100644
--- a/man/pgg.texi
+++ b/man/pgg.texi
@@ -8,8 +8,8 @@
 @copying
 This file describes PGG, an Emacs interface to various PGP implementations.
 
-Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-Copyright @copyright{} 2001 Daiki Ueno.
+Copyright @copyright{} 2001, 2003, 2004, 2005, 2006, 2007  Free Software
+Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/picture-xtra.texi b/man/picture-xtra.texi
index 61ff949f448..ad3b9f27cc5 100644
--- a/man/picture-xtra.texi
+++ b/man/picture-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
diff --git a/man/programs.texi b/man/programs.texi
index 1aa8a65be0a..5283a1de288 100644
--- a/man/programs.texi
+++ b/man/programs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Programs, Building, Text, Top
 @chapter Editing Programs
diff --git a/man/rcirc.texi b/man/rcirc.texi
index 15744e6642c..7b2d6b1c945 100644
--- a/man/rcirc.texi
+++ b/man/rcirc.texi
@@ -5,7 +5,7 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/reftex.texi b/man/reftex.texi
index 1abef984d40..2b77b26c066 100644
--- a/man/reftex.texi
+++ b/man/reftex.texi
@@ -25,8 +25,8 @@ citations and indices for LaTeX documents with Emacs.
 This is edition @value{EDITION} of the @b{Ref@TeX{}} User Manual for
 @b{Ref@TeX{}} @value{VERSION}
 
-Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2004, 2005, 2006
-Free Software Foundation, Inc.
+Copyright @copyright{} 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+2005, 2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/regs.texi b/man/regs.texi
index 8b31a992ea3..475a3b7b1b5 100644
--- a/man/regs.texi
+++ b/man/regs.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
+@c   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Registers, Display, CUA Bindings, Top
 @chapter Registers
diff --git a/man/rmail.texi b/man/rmail.texi
index 8e2ae9ccdbf..02d56e24e15 100644
--- a/man/rmail.texi
+++ b/man/rmail.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Rmail, Dired, Sending Mail, Top
 @chapter Reading Mail with Rmail
diff --git a/man/sc.texi b/man/sc.texi
index 185853e108c..d3f7264f4cc 100644
--- a/man/sc.texi
+++ b/man/sc.texi
@@ -16,7 +16,7 @@ attributing the replies for various GNU Emacs mail and news reading
 subsystems.
 
 Copyright @copyright{} 1993, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/screen.texi b/man/screen.texi
index f641001579a..87b037849ce 100644
--- a/man/screen.texi
+++ b/man/screen.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Screen, User Input, Acknowledgments, Top
 @chapter The Organization of the Screen
diff --git a/man/search.texi b/man/search.texi
index 532d58fb9d8..47d73bd26f6 100644
--- a/man/search.texi
+++ b/man/search.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Search, Fixit, Display, Top
 @chapter Searching and Replacement
diff --git a/man/sending.texi b/man/sending.texi
index 41b26cde430..a130a58816a 100644
--- a/man/sending.texi
+++ b/man/sending.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Sending Mail
 @chapter Sending Mail
diff --git a/man/ses.texi b/man/ses.texi
index a2b70363abd..ff4b47f2ee4 100644
--- a/man/ses.texi
+++ b/man/ses.texi
@@ -11,8 +11,8 @@
 @copying
 This file documents SES: the Simple Emacs Spreadsheet.
 
-Copyright @copyright{} 2002, 2003, 2004, 2005, 2006 Free Software
-Foundation, Inc.
+Copyright @copyright{} 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/sieve.texi b/man/sieve.texi
index ecd476ee1cd..5e11adcaac2 100644
--- a/man/sieve.texi
+++ b/man/sieve.texi
@@ -9,8 +9,8 @@
 @copying
 This file documents the Emacs Sieve package, for server-side mail filtering.
 
-Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006 Free
-Software Foundation, Inc.
+Copyright @copyright{} 2001, 2002, 2003, 2004, 2005, 2006, 2007
+Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/smtpmail.texi b/man/smtpmail.texi
index 9e0a4232969..860e06de0e1 100644
--- a/man/smtpmail.texi
+++ b/man/smtpmail.texi
@@ -3,7 +3,7 @@
 @settitle Emacs SMTP Library
 @syncodeindex vr fn
 @copying
-Copyright @copyright{} 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/speedbar.texi b/man/speedbar.texi
index 73b9d3e9719..42f9f3dcc48 100644
--- a/man/speedbar.texi
+++ b/man/speedbar.texi
@@ -5,8 +5,8 @@
 @syncodeindex fn cp
 
 @copying
-Copyright @copyright{} 1999, 2000, 2002, 2003, 2004, 2005, 2006 Free
-Software Foundation, Inc.
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/texinfo.tex b/man/texinfo.tex
index 4d47842579b..302204c2721 100644
--- a/man/texinfo.tex
+++ b/man/texinfo.tex
@@ -6,8 +6,8 @@
 \def\texinfoversion{2006-11-08.17}
 %
 % Copyright (C) 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995,
-% 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free
-% Software Foundation, Inc.
+%   1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+%   2007  Free Software Foundation, Inc.
 %
 % This texinfo.tex file is free software; you can redistribute it and/or
 % modify it under the terms of the GNU General Public License as
diff --git a/man/text.texi b/man/text.texi
index 4cdc78934e0..3a0e091ea40 100644
--- a/man/text.texi
+++ b/man/text.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Text, Programs, Indentation, Top
 @chapter Commands for Human Languages
diff --git a/man/tramp.texi b/man/tramp.texi
index 4a09e2daa3c..9597344ee0c 100644
--- a/man/tramp.texi
+++ b/man/tramp.texi
@@ -25,7 +25,7 @@
 @end macro
 
 @copying
-Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
 Free Software Foundation, Inc.
 
 @quotation
diff --git a/man/trouble.texi b/man/trouble.texi
index a462c2468b7..ea494445a4e 100644
--- a/man/trouble.texi
+++ b/man/trouble.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2001, 2002,
-@c   2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @iftex
 @chapter Dealing with Common Problems
diff --git a/man/url.texi b/man/url.texi
index 610bf75bdcd..6fe28467788 100644
--- a/man/url.texi
+++ b/man/url.texi
@@ -21,9 +21,8 @@
 @ifnottex
 This file documents the URL loading package.
 
-Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2004,
-2005, 2006 Free Software Foundation, Inc.@*
-Copyright @copyright{} 1993, 1994, 1995, 1996  William M. Perry
+Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002,
+2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
@@ -50,9 +49,8 @@ License.''
 @center @email{fx@@gnu.org}
 @page
 @vskip 0pt plus 1filll
-Copyright @copyright{} 1993, 1994, 1995, 1996 William M. Perry@*
-Copyright @copyright{} 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+Copyright @copyright{} 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002,
+2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 Permission is granted to copy, distribute and/or modify this document
 under the terms of the GNU Free Documentation License, Version 1.2 or
diff --git a/man/vc-xtra.texi b/man/vc-xtra.texi
index 6e8985b2e39..6ec69d60896 100644
--- a/man/vc-xtra.texi
+++ b/man/vc-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included in emacs-xtra.texi when producing the printed
diff --git a/man/vc1-xtra.texi b/man/vc1-xtra.texi
index 16edf79a3bd..6d5df78848c 100644
--- a/man/vc1-xtra.texi
+++ b/man/vc1-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in vc-xtra.texi (when producing the
diff --git a/man/vc2-xtra.texi b/man/vc2-xtra.texi
index 14b8bc9fb07..11c8ea1fb96 100644
--- a/man/vc2-xtra.texi
+++ b/man/vc2-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in vc-xtra.texi (when producing the
diff --git a/man/vip.texi b/man/vip.texi
index 39bd96618a1..11c21cbdf6e 100644
--- a/man/vip.texi
+++ b/man/vip.texi
@@ -5,7 +5,7 @@
 
 @copying
 Copyright @copyright{} 1987, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/viper.texi b/man/viper.texi
index eb77bb71e1d..af78bd99e47 100644
--- a/man/viper.texi
+++ b/man/viper.texi
@@ -8,7 +8,7 @@
 
 @copying
 Copyright @copyright{} 1995, 1996, 1997, 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/widget.texi b/man/widget.texi
index 79ec7ab0d0b..a55c2d529d3 100644
--- a/man/widget.texi
+++ b/man/widget.texi
@@ -10,8 +10,8 @@
 @c %**end of header
 
 @copying
-Copyright @copyright{} 2000, 2002, 2003, 2004, 2005,
-2006 Free Software Foundation, Inc.
+Copyright @copyright{} 2000, 2001, 2002, 2003, 2004, 2005,
+2006, 2007  Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/windows.texi b/man/windows.texi
index 43609b4abdb..fa9cadc1351 100644
--- a/man/windows.texi
+++ b/man/windows.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 2000, 2001,
-@c   2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Windows, Frames, Buffers, Top
 @chapter Multiple Windows
diff --git a/man/woman.texi b/man/woman.texi
index d7a21d0a68a..c7476cf82c0 100644
--- a/man/woman.texi
+++ b/man/woman.texi
@@ -18,7 +18,7 @@ This file documents WoMan: A program to browse Unix manual pages `W.O.
 (without) man'.
 
 Copyright @copyright{} 2001, 2002, 2003, 2004,
-2005, 2006 Free Software Foundation, Inc.
+2005, 2006, 2007 Free Software Foundation, Inc.
 
 @quotation
 Permission is granted to copy, distribute and/or modify this document
diff --git a/man/xresources.texi b/man/xresources.texi
index 941b61f9b85..45a890e7c39 100644
--- a/man/xresources.texi
+++ b/man/xresources.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003,
-@c   2004, 2005, 2006 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node X Resources, Antinews, Emacs Invocation, Top
 @appendix X Options and Resources
diff --git a/msdos/COPYING.DJ b/msdos/COPYING.DJ
new file mode 100644
index 00000000000..e2aef74b931
--- /dev/null
+++ b/msdos/COPYING.DJ
@@ -0,0 +1,49 @@
+This is the file "COPYING.DJ".  It does NOT apply to any sources or
+binaries copyrighted by UCB Berkeley, the Free Software Foundation, or
+any other agency besides DJ Delorie and others who have agreed to
+allow their sources to be distributed under these terms.
+
+   Copyright Information for sources and executables that are marked
+   Copyright (C) DJ Delorie
+                 334 North Rd
+                 Deerfield NH 03037-1110
+
+This document is Copyright (C) DJ Delorie and may be distributed
+verbatim, but changing it is not allowed.
+
+Source code copyright DJ Delorie is distributed under the terms of the
+GNU General Public Licence, with the following exceptions:
+
+* Sources used to build crt0.o, gcrt0.o, libc.a, libdbg.a, and
+  libemu.a are distributed under the terms of the GNU Library General
+  Public License, rather than the GNU GPL.
+
+* Any existing copyright or authorship information in any given source
+  file must remain intact.  If you modify a source file, a notice to that
+  effect must be added to the authorship information in the source file. 
+
+* Runtime binaries, as provided by DJ in DJGPP, may be distributed
+  without sources ONLY if the recipient is given sufficient information
+  to obtain a copy of djgpp themselves.  This primarily applies to
+  go32-v2.exe, emu387.dxe, and stubedit.exe.
+
+* Runtime objects and libraries, as provided by DJ in DJGPP, when
+  linked into an application, may be distributed without sources ONLY
+  if the recipient is given sufficient information to obtain a copy of
+  djgpp themselves.  This primarily applies to crt0.o and libc.a.
+
+-----
+
+Changes to source code copyright BSD, FSF, or others, by DJ Delorie
+fall under the terms of the original copyright.  Such files usually
+have multiple copyright notices in them.
+
+A copy of the files "COPYING" and "COPYING.LIB" are included with this
+document.  If you did not receive a copy of these files, you may
+obtain one from whence this document was obtained, or by writing:
+
+      Free Software Foundation, Inc.
+      51 Franklin Street,
+      Fifth Floor,
+      Boston, MA 02110-1301,
+      USA
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index ef25dc257f0..0142645728f 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,7 @@
+2007-01-28  Glenn Morris  <rgm@gnu.org>
+
+	* COPYING.DJ: New file.
+
 2006-12-04  Eli Zaretskii  <eliz@gnu.org>
 
 	* sed2v2.inp (HAVE_SYNC): Define.
@@ -629,7 +633,7 @@
 ;; End:
 
     Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
-       2004, 2005, 2006 Free Software Foundation, Inc.
+       2004, 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/msdos/README b/msdos/README
index 40f579cf49f..890168bfac4 100644
--- a/msdos/README
+++ b/msdos/README
@@ -7,7 +7,7 @@ Windows 3.X.  Since these are binary files, their copyright notice is
 reproduced here:
 
 # Copyright (C) 1993, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+#   2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/mainmake b/msdos/mainmake
index 1b69bfd24e6..569387f65d2 100644
--- a/msdos/mainmake
+++ b/msdos/mainmake
@@ -1,5 +1,5 @@
 # Copyright (C) 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+#   2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/msdos/mainmake.v2 b/msdos/mainmake.v2
index d46651e3253..14610ba79bb 100644
--- a/msdos/mainmake.v2
+++ b/msdos/mainmake.v2
@@ -1,7 +1,7 @@
 # Top-level Makefile for Emacs under MS-DOS/DJGPP v2.0 or higher. -*-makefile-*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+#   2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
diff --git a/msdos/sed1.inp b/msdos/sed1.inp
index b13a7ae08ac..5fef6695f0e 100644
--- a/msdos/sed1.inp
+++ b/msdos/sed1.inp
@@ -2,8 +2,8 @@
 # Configuration script for src/makefile
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
+#   2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index be672842410..688a946b5d5 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -2,8 +2,8 @@
 # Configuration script for src/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed2.inp b/msdos/sed2.inp
index 3f5852e6c59..13b7169b302 100644
--- a/msdos/sed2.inp
+++ b/msdos/sed2.inp
@@ -2,8 +2,8 @@
 # Configuration script for src/config.h
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-#   2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
+#   2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed2v2.inp b/msdos/sed2v2.inp
index 20e478522a7..786374bfb46 100644
--- a/msdos/sed2v2.inp
+++ b/msdos/sed2v2.inp
@@ -3,7 +3,7 @@
 # ----------------------------------------------------------------------
 #
 # Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2002, 2003,
-#   2004, 2005, 2006 Free Software Foundation, Inc.
+#   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed2x.inp b/msdos/sed2x.inp
index b31d1361ace..f7ddf2c193a 100644
--- a/msdos/sed2x.inp
+++ b/msdos/sed2x.inp
@@ -2,8 +2,8 @@
 # Extra configuration script for src/config.h for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed3.inp b/msdos/sed3.inp
index 299e44fe6df..69c27620443 100644
--- a/msdos/sed3.inp
+++ b/msdos/sed3.inp
@@ -2,8 +2,8 @@
 # Configuration script for lib-src/makefile
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed3v2.inp b/msdos/sed3v2.inp
index 39d644999fa..bd4521e107b 100644
--- a/msdos/sed3v2.inp
+++ b/msdos/sed3v2.inp
@@ -2,8 +2,8 @@
 # Configuration script for lib-src/makefile under DJGPP v2
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1996, 1998, 2000, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed4.inp b/msdos/sed4.inp
index fcdf6cef47d..0c141b53e66 100644
--- a/msdos/sed4.inp
+++ b/msdos/sed4.inp
@@ -2,8 +2,8 @@
 # Configuration script for src/paths.h
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed5x.inp b/msdos/sed5x.inp
index 54d56825bef..4bb860e415a 100644
--- a/msdos/sed5x.inp
+++ b/msdos/sed5x.inp
@@ -2,8 +2,8 @@
 # Configuration script for oldxmenu/makefile for DesqView/X
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1994, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+# Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sed6.inp b/msdos/sed6.inp
index b74d2aa3a54..fe377878b5d 100644
--- a/msdos/sed6.inp
+++ b/msdos/sed6.inp
@@ -4,7 +4,7 @@
 # ---------------------------------------------------------------------------
 #
 # Copyright (C) 1997, 2000, 2001, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+#   2005, 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sedleim.inp b/msdos/sedleim.inp
index c5d2e1daded..5b10be9d65d 100644
--- a/msdos/sedleim.inp
+++ b/msdos/sedleim.inp
@@ -2,8 +2,8 @@
 # Configuration script for leim/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 1999, 2000, 2002, 2003, 2004,
-#   2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004,
+#   2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/msdos/sedlisp.inp b/msdos/sedlisp.inp
index 49dcabc588a..1372dbd9b67 100644
--- a/msdos/sedlisp.inp
+++ b/msdos/sedlisp.inp
@@ -2,8 +2,8 @@
 # Configuration script for lisp/Makefile under DJGPP v2.x
 # ----------------------------------------------------------------------
 #
-# Copyright (C) 2000, 2002, 2003, 2004, 2005,
-#   2006 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/nt/ChangeLog b/nt/ChangeLog
index f3c983e8b37..9475eeb32ff 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1311,7 +1311,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-       2005, 2006 Free Software Foundation, Inc.
+       2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/nt/INSTALL b/nt/INSTALL
index 9033153fcae..24d2e1ed8da 100644
--- a/nt/INSTALL
+++ b/nt/INSTALL
@@ -1,7 +1,7 @@
 		      Building and Installing Emacs
 		on Windows NT/2K/XP and Windows 95/98/ME
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
     Free Software Foundation, Inc.
   See the end of the file for copying permissions.
 
diff --git a/nt/README b/nt/README
index 6a83eadfbb3..c7aad45d081 100644
--- a/nt/README
+++ b/nt/README
@@ -1,6 +1,6 @@
 	     Emacs for Windows NT/2000 and Windows 95/98/ME
 
-  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006
+  Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006,
      2007 Free Software Foundation, Inc.
   See the end of the INSTALL file in this directory for copying permissions.
 
diff --git a/nt/addpm.c b/nt/addpm.c
index 08d84c70b81..32b4bd6b532 100644
--- a/nt/addpm.c
+++ b/nt/addpm.c
@@ -1,6 +1,6 @@
 /* Add entries to the GNU Emacs Program Manager folder.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/addsection.c b/nt/addsection.c
index b6d119fe6a8..055240ac715 100644
--- a/nt/addsection.c
+++ b/nt/addsection.c
@@ -1,6 +1,6 @@
 /* Add an uninitialized data section to an executable.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/cmdproxy.c b/nt/cmdproxy.c
index 0b47ecd52b9..4e4f1ef5c91 100644
--- a/nt/cmdproxy.c
+++ b/nt/cmdproxy.c
@@ -1,6 +1,6 @@
 /* Proxy shell designed for use with Emacs on Windows 95 and NT.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
    Accepts subset of Unix sh(1) command-line options, for compatability
    with elisp code written for Unix.  When possible, executes external
diff --git a/nt/config.nt b/nt/config.nt
index c2e2ed8782e..4a0d6897b05 100644
--- a/nt/config.nt
+++ b/nt/config.nt
@@ -1,6 +1,6 @@
 /* GNU Emacs site configuration template file.  -*- C -*-
-   Copyright (C) 1988, 1993, 1994, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 2001, 2002, 2003, 2004,
+      2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/configure.bat b/nt/configure.bat
index 1e411e8ad2c..ad44416651a 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -2,7 +2,7 @@
 rem   ----------------------------------------------------------------------

 rem   Configuration script for MS Windows 95/98/Me and NT/2000/XP

 rem   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005,

-rem      2006 Free Software Foundation, Inc.

+rem      2006, 2007 Free Software Foundation, Inc.

 

 rem   This file is part of GNU Emacs.

 

diff --git a/nt/ddeclient.c b/nt/ddeclient.c
index bd192c61f47..f2efdfd903b 100644
--- a/nt/ddeclient.c
+++ b/nt/ddeclient.c
@@ -1,6 +1,6 @@
 /* Simple client interface to DDE servers.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/emacs.rc b/nt/emacs.rc
index 4dbd51c6adc..1879a8655d2 100644
--- a/nt/emacs.rc
+++ b/nt/emacs.rc
@@ -6,8 +6,8 @@ Emacs ICON   icons\emacs.ico
 #endif
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 22,0,92,0
- PRODUCTVERSION 22,0,92,0
+ FILEVERSION 22,0,93,0
+ PRODUCTVERSION 22,0,93,0
  FILEFLAGSMASK 0x3FL
 #ifdef EMACSDEBUG
  FILEFLAGS 0x1L
@@ -24,12 +24,12 @@ BEGIN
 	BEGIN
 	    VALUE "CompanyName", "Free Software Foundation\0"
 	    VALUE "FileDescription", "GNU Emacs for Windows NT/95/98/2000/ME/XP\0"
-	    VALUE "FileVersion", "22, 0, 92, 0\0"
+	    VALUE "FileVersion", "22, 0, 93, 0\0"
 	    VALUE "InternalName", "Emacs\0"
-	    VALUE "LegalCopyright", "Copyright (C) 2002, 2003, 2004, 2005, 2006\0"
+	    VALUE "LegalCopyright", "Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007\0"
 	    VALUE "OriginalFilename", "emacs.exe"
 	    VALUE "ProductName", "Emacs: The extensible self-documenting text editor\0"
-	    VALUE "ProductVersion", "22, 0, 92, 0\0"
+	    VALUE "ProductVersion", "22, 0, 93, 0\0"
 	    VALUE "OLESelfRegister", "\0"
 	 END
      END
diff --git a/nt/envadd.bat b/nt/envadd.bat
index ece62f971bd..16e653d4a88 100644
--- a/nt/envadd.bat
+++ b/nt/envadd.bat
@@ -1,7 +1,7 @@
 rem  Hack to change/add environment variables in the makefiles for the

 rem  Windows platform.

 rem

-rem  Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 rem

 rem  This file is part of GNU Emacs.

 rem

diff --git a/nt/gmake.defs b/nt/gmake.defs
index cf3b3a57990..15ec2bf0ea3 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#    2005, 2006 Free Software Foundation, Inc.
+#    2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #  GNU Emacs is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
diff --git a/nt/inc/grp.h b/nt/inc/grp.h
index 04c2982086b..1ccc4c4eb74 100755
--- a/nt/inc/grp.h
+++ b/nt/inc/grp.h
@@ -1,5 +1,5 @@
 /* Replacement grp.h file for building GNU Emacs on Windows.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/langinfo.h b/nt/inc/langinfo.h
index 9661a4833d2..b445ff0caa2 100644
--- a/nt/inc/langinfo.h
+++ b/nt/inc/langinfo.h
@@ -1,5 +1,5 @@
 /* Replacement langinfo.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/nl_types.h b/nt/inc/nl_types.h
index 31c21be00bb..ce0e54bfcee 100644
--- a/nt/inc/nl_types.h
+++ b/nt/inc/nl_types.h
@@ -1,5 +1,5 @@
 /* Replacement nl_types.h file for building GNU Emacs on Windows.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/inc/sys/socket.h b/nt/inc/sys/socket.h
index c0a3bc26ec4..0923dd9246b 100644
--- a/nt/inc/sys/socket.h
+++ b/nt/inc/sys/socket.h
@@ -1,5 +1,5 @@
-/* Copyright (C) 1995, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+/* Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/makefile.w32-in b/nt/makefile.w32-in
index e63df000f08..f579855522e 100644
--- a/nt/makefile.w32-in
+++ b/nt/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.

 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,

-#    2005, 2006 Free Software Foundation, Inc.

+#    2005, 2006, 2007 Free Software Foundation, Inc.

 #

 #  Top level makefile for building GNU Emacs on Windows NT

 #

diff --git a/nt/multi-install-info.bat b/nt/multi-install-info.bat
index 0b21962a458..2ee5879f11d 100644
--- a/nt/multi-install-info.bat
+++ b/nt/multi-install-info.bat
@@ -3,7 +3,7 @@
 rem  Hack to run install-info with multiple info files on the command

 rem  line on the Windows platform.

 rem

-rem  Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.

+rem  Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.

 rem

 rem  This file is part of GNU Emacs.

 rem

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 96973e53a32..5f52bc18c62 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- definition file for building GNU Emacs on Windows NT.

 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,

-#    2005, 2006 Free Software Foundation, Inc.

+#    2005, 2006, 2007 Free Software Foundation, Inc.

 #

 #  GNU Emacs is free software; you can redistribute it and/or modify

 #  it under the terms of the GNU General Public License as published by

diff --git a/nt/paths.h b/nt/paths.h
index f3d272da350..d2077d90df4 100644
--- a/nt/paths.h
+++ b/nt/paths.h
@@ -1,5 +1,5 @@
 /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-      2005, 2006 Free Software Foundation, Inc.
+      2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/preprep.c b/nt/preprep.c
index fb686f42b96..7fedd9b8df2 100644
--- a/nt/preprep.c
+++ b/nt/preprep.c
@@ -1,6 +1,6 @@
 /* Pro-process emacs.exe for profiling by MSVC.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-      2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+      2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/nt/runemacs.c b/nt/runemacs.c
index d820a92acbb..6b6b84e33be 100644
--- a/nt/runemacs.c
+++ b/nt/runemacs.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/oldXMenu/Activate.c b/oldXMenu/Activate.c
index ad29bd6e8c5..840fe6d8d07 100644
--- a/oldXMenu/Activate.c
+++ b/oldXMenu/Activate.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
diff --git a/oldXMenu/AddPane.c b/oldXMenu/AddPane.c
index 35d85a863b7..d80f1633077 100644
--- a/oldXMenu/AddPane.c
+++ b/oldXMenu/AddPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/AddSel.c b/oldXMenu/AddSel.c
index dca0e4be88b..0d1085bb3d5 100644
--- a/oldXMenu/AddSel.c
+++ b/oldXMenu/AddSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index 07c4654b278..b44c310165a 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -445,7 +445,7 @@
 ;; End:
 
     Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001,
-	2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+	2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/oldXMenu/ChgPane.c b/oldXMenu/ChgPane.c
index ce9b8b8b3e8..463b57151ed 100644
--- a/oldXMenu/ChgPane.c
+++ b/oldXMenu/ChgPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/ChgSel.c b/oldXMenu/ChgSel.c
index 9e80240cd51..4249982d7d1 100644
--- a/oldXMenu/ChgSel.c
+++ b/oldXMenu/ChgSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Create.c b/oldXMenu/Create.c
index 679f5b84183..52560d01a68 100644
--- a/oldXMenu/Create.c
+++ b/oldXMenu/Create.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 #include "copyright.h"
 
diff --git a/oldXMenu/DelPane.c b/oldXMenu/DelPane.c
index 7680cb65de7..fa300d91142 100644
--- a/oldXMenu/DelPane.c
+++ b/oldXMenu/DelPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/DelSel.c b/oldXMenu/DelSel.c
index bae42c21572..dd63b1c49ee 100644
--- a/oldXMenu/DelSel.c
+++ b/oldXMenu/DelSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Destroy.c b/oldXMenu/Destroy.c
index 082de8872a4..f673ed9fcad 100644
--- a/oldXMenu/Destroy.c
+++ b/oldXMenu/Destroy.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Error.c b/oldXMenu/Error.c
index d05cabc2d56..35f5920e34a 100644
--- a/oldXMenu/Error.c
+++ b/oldXMenu/Error.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/EvHand.c b/oldXMenu/EvHand.c
index 84836c92e1c..d0d2b8efa91 100644
--- a/oldXMenu/EvHand.c
+++ b/oldXMenu/EvHand.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindPane.c b/oldXMenu/FindPane.c
index 4f354562d6c..1ac74ef2b43 100644
--- a/oldXMenu/FindPane.c
+++ b/oldXMenu/FindPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/FindSel.c b/oldXMenu/FindSel.c
index cf14656aad1..56bb177d68d 100644
--- a/oldXMenu/FindSel.c
+++ b/oldXMenu/FindSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsPane.c b/oldXMenu/InsPane.c
index 063b811a7da..980694f4cc4 100644
--- a/oldXMenu/InsPane.c
+++ b/oldXMenu/InsPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/InsSel.c b/oldXMenu/InsSel.c
index 540787f7b21..f4f615b430d 100644
--- a/oldXMenu/InsSel.c
+++ b/oldXMenu/InsSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Internal.c b/oldXMenu/Internal.c
index 8a656ebcfe9..f569c6d24df 100644
--- a/oldXMenu/Internal.c
+++ b/oldXMenu/Internal.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Locate.c b/oldXMenu/Locate.c
index 156d75762b1..f419ba2a0bb 100644
--- a/oldXMenu/Locate.c
+++ b/oldXMenu/Locate.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Post.c b/oldXMenu/Post.c
index b4a2a0966ac..281c1197c62 100644
--- a/oldXMenu/Post.c
+++ b/oldXMenu/Post.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/Recomp.c b/oldXMenu/Recomp.c
index ad20508fbf3..e985ee3e2a8 100644
--- a/oldXMenu/Recomp.c
+++ b/oldXMenu/Recomp.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetAEQ.c b/oldXMenu/SetAEQ.c
index 0b431ec712b..49ff6646a24 100644
--- a/oldXMenu/SetAEQ.c
+++ b/oldXMenu/SetAEQ.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetFrz.c b/oldXMenu/SetFrz.c
index a9a0ca6a712..e6444551951 100644
--- a/oldXMenu/SetFrz.c
+++ b/oldXMenu/SetFrz.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 98a028e32c2..61759e3793d 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/SetSel.c b/oldXMenu/SetSel.c
index 2aaf354b598..e6f57bd0104 100644
--- a/oldXMenu/SetSel.c
+++ b/oldXMenu/SetSel.c
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/X10.h b/oldXMenu/X10.h
index e6ac3433620..cc592525a81 100644
--- a/oldXMenu/X10.h
+++ b/oldXMenu/X10.h
@@ -16,7 +16,7 @@
  */
 
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  *	X10.h - Header definition and support file for the C subroutine
diff --git a/oldXMenu/XCrAssoc.c b/oldXMenu/XCrAssoc.c
index 7e022ce566b..c24928c9a3e 100644
--- a/oldXMenu/XCrAssoc.c
+++ b/oldXMenu/XCrAssoc.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDelAssoc.c b/oldXMenu/XDelAssoc.c
index 3e111dceacd..1d69cf8c138 100644
--- a/oldXMenu/XDelAssoc.c
+++ b/oldXMenu/XDelAssoc.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XDestAssoc.c b/oldXMenu/XDestAssoc.c
index 8cb1faa2d69..706fa680f89 100644
--- a/oldXMenu/XDestAssoc.c
+++ b/oldXMenu/XDestAssoc.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XLookAssoc.c b/oldXMenu/XLookAssoc.c
index 4f3892800d5..d275137e57d 100644
--- a/oldXMenu/XLookAssoc.c
+++ b/oldXMenu/XLookAssoc.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index 443c1f447e6..b6b0e470764 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
 Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/oldXMenu/XMenu.h b/oldXMenu/XMenu.h
index b3933211199..ef94cf0a07a 100644
--- a/oldXMenu/XMenu.h
+++ b/oldXMenu/XMenu.h
@@ -2,7 +2,7 @@
 
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/XMenuInt.h b/oldXMenu/XMenuInt.h
index 683ed14e778..9bf976ccc6b 100644
--- a/oldXMenu/XMenuInt.h
+++ b/oldXMenu/XMenuInt.h
@@ -1,6 +1,6 @@
 /* Copyright    Massachusetts Institute of Technology    1985	*/
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:	MIT Project Athena, X Window system menu package
diff --git a/oldXMenu/copyright.h b/oldXMenu/copyright.h
index 7f4208bce85..c61632b3818 100644
--- a/oldXMenu/copyright.h
+++ b/oldXMenu/copyright.h
@@ -17,7 +17,7 @@ without express or implied warranty.
 */
 
 /* Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.  */
+                 2006, 2007 Free Software Foundation, Inc.  */
 
 /* arch-tag: c689b1bc-a3ba-41a1-baa0-a3622b5445b2
    (do not change this comment) */
diff --git a/oldXMenu/insque.c b/oldXMenu/insque.c
index 2ee8556cdb6..66b442ea29b 100644
--- a/oldXMenu/insque.c
+++ b/oldXMenu/insque.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/src/.gdbinit b/src/.gdbinit
index 0561d53a937..8d8c163b3b6 100644
--- a/src/.gdbinit
+++ b/src/.gdbinit
@@ -1,5 +1,5 @@
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2000, 2001,
-#   2004, 2005, 2006 Free Software Foundation, Inc.
+#   2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
@@ -158,7 +158,8 @@ define ppt
   printf " SZ=%d\n", $t->gap_size
 end
 document ppt
-Print point, beg, end, narrow, and gap for current buffer.
+Print current buffer's point and boundaries.
+Prints values of point, beg, end, narrow, and gap for current buffer.
 end
 
 # Print out iterator given as first arg
@@ -312,7 +313,7 @@ define pcursorx
   printf "y=%d x=%d vpos=%d hpos=%d", $cp->y, $cp->x, $cp->vpos, $cp->hpos
 end
 document pcursorx
-Pretty print a window cursor
+Pretty print a window cursor.
 end
 
 define pcursor
@@ -321,7 +322,7 @@ define pcursor
   printf "\n"
 end
 document pcursor
-Pretty print the output_cursor
+Pretty print the output_cursor.
 end
 
 define pwinx
@@ -381,7 +382,7 @@ define pwinx
 end
 document pwinx
 Pretty print a window structure.
-Takes one argument, a pointer to a window structure
+Takes one argument, a pointer to a window structure.
 end
 
 define pwin
@@ -447,7 +448,7 @@ define pgx
 end
 document pgx
 Pretty print a glyph structure.
-Takes one argument, a pointer to a glyph structure
+Takes one argument, a pointer to a glyph structure.
 end
 
 define pg
@@ -532,7 +533,8 @@ define xvectype
   echo \n
 end
 document xvectype
-Print the size or vector subtype of $, assuming it is a vector or pseudovector.
+Print the size or vector subtype of $.
+This command assumes that $ is a vector or pseudovector.
 end
 
 define xmisctype
@@ -541,7 +543,7 @@ define xmisctype
   echo \n
 end
 document xmisctype
-Print the specific type of $, assuming it is some misc type.
+Assume that $ is some misc type and print its specific type.
 end
 
 define xint
@@ -549,7 +551,7 @@ define xint
   print $int
 end
 document xint
-Print $, assuming it is an Emacs Lisp integer.  This gets the sign right.
+Print $ as an Emacs Lisp integer.  This gets the sign right.
 end
 
 define xptr
@@ -557,7 +559,7 @@ define xptr
   print (void *) $ptr
 end
 document xptr
-Print the pointer portion of $, assuming it is an Emacs Lisp value.
+Print the pointer portion of an Emacs Lisp value in $.
 end
 
 define xmarker
@@ -565,7 +567,8 @@ define xmarker
   print (struct Lisp_Marker *) $ptr
 end
 document xmarker
-Print $ as a marker pointer, assuming it is an Emacs Lisp marker value.
+Print $ as a marker pointer.
+This command assumes that $ is an Emacs Lisp marker value.
 end
 
 define xoverlay
@@ -573,7 +576,8 @@ define xoverlay
   print (struct Lisp_Overlay *) $ptr
 end
 document xoverlay
-Print $ as a overlay pointer, assuming it is an Emacs Lisp overlay value.
+Print $ as a overlay pointer.
+This command assumes that $ is an Emacs Lisp overlay value.
 end
 
 define xmiscfree
@@ -581,7 +585,8 @@ define xmiscfree
   print (struct Lisp_Free *) $ptr
 end
 document xmiscfree
-Print $ as a misc free-cell pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a misc free-cell pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xintfwd
@@ -589,7 +594,8 @@ define xintfwd
   print (struct Lisp_Intfwd *) $ptr
 end
 document xintfwd
-Print $ as an integer forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as an integer forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xboolfwd
@@ -597,7 +603,8 @@ define xboolfwd
   print (struct Lisp_Boolfwd *) $ptr
 end
 document xboolfwd
-Print $ as a boolean forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a boolean forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xobjfwd
@@ -605,7 +612,8 @@ define xobjfwd
   print (struct Lisp_Objfwd *) $ptr
 end
 document xobjfwd
-Print $ as an object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as an object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xbufobjfwd
@@ -613,7 +621,8 @@ define xbufobjfwd
   print (struct Lisp_Buffer_Objfwd *) $ptr
 end
 document xbufobjfwd
-Print $ as a buffer-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a buffer-local object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xkbobjfwd
@@ -621,7 +630,8 @@ define xkbobjfwd
   print (struct Lisp_Kboard_Objfwd *) $ptr
 end
 document xkbobjfwd
-Print $ as a kboard-local object forwarding pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a kboard-local object forwarding pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xbuflocal
@@ -629,7 +639,8 @@ define xbuflocal
   print (struct Lisp_Buffer_Local_Value *) $ptr
 end
 document xbuflocal
-Print $ as a buffer-local-value pointer, assuming it is an Emacs Lisp Misc value.
+Print $ as a buffer-local-value pointer.
+This command assumes that $ is an Emacs Lisp Misc value.
 end
 
 define xsymbol
@@ -673,7 +684,8 @@ define xprocess
   echo \n
 end
 document xprocess
-Print the address of the struct Lisp_process which the Lisp_Object $ points to.
+Print the address of the struct Lisp_process to which $ points.
+This command assumes that $ is a Lisp_Object.
 end
 
 define xframe
@@ -685,7 +697,8 @@ define xframe
   echo \n
 end
 document xframe
-Print $ as a frame pointer, assuming it is an Emacs Lisp frame value.
+Print $ as a frame pointer.
+This command assumes $ is an Emacs Lisp frame value.
 end
 
 define xcompiled
@@ -694,7 +707,8 @@ define xcompiled
   output ($->contents[0])@($->size & 0xff)
 end
 document xcompiled
-Print $ as a compiled function pointer, assuming it is an Emacs Lisp compiled value.
+Print $ as a compiled function pointer.
+This command assumes that $ is an Emacs Lisp compiled value.
 end
 
 define xwindow
@@ -721,7 +735,8 @@ define xwinconfig
   print (struct save_window_data *) $ptr
 end
 document xwinconfig
-Print $ as a window configuration pointer, assuming it is an Emacs Lisp window configuration value.
+Print $ as a window configuration pointer.
+This command assumes that $ is an Emacs Lisp window configuration value.
 end
 
 define xsubr
@@ -766,8 +781,8 @@ define xbuffer
   echo \n
 end
 document xbuffer
-Set $ as a buffer pointer, assuming it is an Emacs Lisp buffer value.
-Print the name of the buffer.
+Set $ as a buffer pointer and the name of the buffer.
+This command assumes $ is an Emacs Lisp buffer value.
 end
 
 define xhashtable
@@ -775,7 +790,8 @@ define xhashtable
   print (struct Lisp_Hash_Table *) $ptr
 end
 document xhashtable
-Set $ as a hash table pointer, assuming it is an Emacs Lisp hash table value.
+Set $ as a hash table pointer.
+This command assumes that $ is an Emacs Lisp hash table value.
 end
 
 define xcons
@@ -785,7 +801,7 @@ define xcons
   echo \n
 end
 document xcons
-Print the contents of $, assuming it is an Emacs Lisp cons.
+Print the contents of $ as an Emacs Lisp cons.
 end
 
 define nextcons
@@ -794,7 +810,7 @@ define nextcons
 end
 document nextcons
 Print the contents of the next cell in a list.
-This assumes that the last thing you printed was a cons cell contents
+This command assumes that the last thing you printed was a cons cell contents
 (type struct Lisp_Cons) or a pointer to one.
 end
 define xcar
@@ -803,7 +819,7 @@ define xcar
   print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->car : 0)
 end
 document xcar
-Print the car of $, assuming it is an Emacs Lisp pair.
+Assume that $ is an Emacs Lisp pair and print its car.
 end
 
 define xcdr
@@ -812,7 +828,7 @@ define xcdr
   print/x ($type == Lisp_Cons ? ((struct Lisp_Cons *) $ptr)->u.cdr : 0)
 end
 document xcdr
-Print the cdr of $, assuming it is an Emacs Lisp pair.
+Assume that $ is an Emacs Lisp pair and print its cdr.
 end
 
 define xlist
@@ -1007,7 +1023,7 @@ define which
   set debug_print (which_symbols ($arg0))
 end
 document which
-  Print symbols which references a given lisp object,
+  Print symbols which references a given lisp object
   either as its symbol value or symbol function.
 end
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 1974d45dd2c..dd133046747 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,151 @@
+2007-01-28  Richard Stallman  <rms@gnu.org>
+
+	* minibuf.c (Ftry_completion, Fall_completions)
+	(Fcompleting_read, Ftest_completion):
+	Rename arg ALIST or TABLE to COLLECTION.
+
+2007-01-27  Chong Yidong  <cyd@stupidchicken.com>
+
+	* unexhp9k800.c: Remove due to lack of legal papers.
+
+	* m/sr2k.h, m/hp800.h: Remove due to dependence on above.
+
+2007-01-27  Eli Zaretskii  <eliz@gnu.org>
+
+	* keyboard.c (Fthis_command_keys, Fthis_command_keys_vector): Doc fix.
+
+	* minibuf.c (Fcompleting_read): Doc fix.
+
+2007-01-26  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* gtkutil.c (xg_initialize): Call XftInit if HAVE_XFT.
+
+	* Makefile.in: Use XFT_LIBS if defined.
+
+2007-01-26  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use
+	BLOCK_INPUT/UNBLOCK_INPUT.
+
+	* blockinput.h (interrupt_input_blocked): Declare volatile.
+
+	* keyboard.c (interrupt_input_blocked): Declare volatile.
+
+	* syssignal.h (SIGNAL_THREAD_CHECK): Use pthread_equal.
+
+2007-01-24  Kim F. Storm  <storm@cua.dk>
+
+	* keymap.c (describe_map): Don't consider prefix keys to be shadowed.
+
+2007-01-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* editfns.c (Finsert_char): Doc fix.
+	(Fget_internal_run_time, Fdecode_time): Fix typos in docstrings.
+
+2007-01-22  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macselect.c [TARGET_API_MAC_CARBON] (mac_do_receive_drag): Don't
+	pass keyboard modifiers to mac_store_drag_event, but put them as
+	kEventParamKeyModifiers Apple event parameter.
+
+2007-01-21  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (try_window): Revert previous change.
+
+	* dispnew.c (update_text_area): Revert 2006-09-17 change.
+	Always redraw non-mode-line rows with mouse-face.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* xdisp.c (try_window): Clear mouse-face highlights first.
+
+	* window.c (set_window_buffer): Revert 2006-11-22 change.
+
+2007-01-20  Eli Zaretskii  <eliz@gnu.org>
+
+	* .gdbinit (ppt, xtype, xmisctype, xint, xptr, xmarker, xframe)
+	(xbuffer, xcons, xcar, xcdr): Fix doc strings.
+
+2007-01-20  Chong Yidong  <cyd@stupidchicken.com>
+
+	* keyboard.c (read_key_sequence): Extract local map only if the
+	given position is in an accessible buffer region.
+
+2007-01-19  Nick Roberts  <nickrob@snap.net.nz>
+
+	* .gdbinit: Reformat documentation so that first sentence
+	displays properly with "help user-defined" (like apropos).
+
+2007-01-18  Bruno Haible  <bruno@clisp.org>  (tiny change)
+
+	* epaths.in: Move PATH_DOC from local/info to local/share/info.
+
+2007-01-15  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]:
+	Create movable modal window instead of movable alert window.
+	(create_and_show_dialog) [!MAC_OSX]: Use DeactivateControl instead
+	of DisableControl.
+
+	* macselect.c (Fmac_resume_apple_event): Set error number when
+	descriptor type of reply is non-null.
+
+2007-01-14  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macmenu.c (create_and_show_dialog) [TARGET_API_MAC_CARBON]: Use
+	DisableControl for disabled items.  Set default button to first
+	enabled one.  Use icon of application in execution.
+
+2007-01-13  Eli Zaretskii  <eliz@gnu.org>
+
+	* process.c (Fdelete_process, Fprocess_id, sigchld_handler):
+	Copy PID into EMACS_INT to avoid GCC warnings.
+
+	* fns.c (maybe_resize_hash_table): Copy new size of hash table
+	into EMACS_INT to avoid GCC warnings.
+
+	* editfns.c (Fuser_uid, Fuser_real_uid): Copy values returned by
+	geteuid and getuid into EMACS_INT to avoid GCC warnings.
+
+	* dired.c (Ffile_attributes): Fix last change.
+
+2007-01-12  Eli Zaretskii  <eliz@gnu.org>
+
+	* dired.c (Ffile_attributes): Copy some members of `struct stat'
+	into int's to avoid GCC warnings about limited range of short in
+	arguments to FIXNUM_OVERFLOW_P.
+
+2007-01-12  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+	* macmenu.c (HAVE_DIALOGS): Define if TARGET_API_MAC_CARBON.
+	(mac_handle_dialog_event, install_dialog_event_handler)
+	(create_and_show_dialog) [TARGET_API_MAC_CARBON]: New functions.
+	(DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN, DIALOG_RIGHT_MARGIN)
+	(DIALOG_BOTTOM_MARGIN, DIALOG_MIN_INNER_WIDTH)
+	(DIALOG_MAX_INNER_WIDTH, DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE)
+	(DIALOG_BUTTON_BUTTON_VERTICAL_SPACE, DIALOG_BUTTON_MIN_WIDTH)
+	(DIALOG_TEXT_MIN_HEIGHT, DIALOG_TEXT_BUTTONS_VERTICAL_SPACE)
+	(DIALOG_ICON_WIDTH, DIALOG_ICON_HEIGHT, DIALOG_ICON_LEFT_MARGIN)
+	(DIALOG_ICON_TOP_MARGIN) [TARGET_API_MAC_CARBON]: New macros.
+	(mac_dialog) [TARGET_API_MAC_CARBON]: Remove function.
+	(mac_dialog_show) [TARGET_API_MAC_CARBON]: Use create_and_show_dialog.
+
+	* macterm.c (x_free_frame_resources) [USE_CG_DRAWING]: Call
+	mac_prepare_for_quickdraw.
+	(quit_char, make_ctrl_char) [TARGET_API_MAC_CARBON]: Move externs
+	outside #ifdef MAC_OSX.
+	(mac_quit_char_key_p) [TARGET_API_MAC_CARBON]: Move function
+	outside #ifdef MAC_OSX.
+	(mac_check_bundle) [MAC_OSX]: Remove unused function.
+
+	* macterm.h (mac_quit_char_key_p): Move extern outside #ifdef MAC_OSX.
+	(HOURGLASS_WIDTH, HOURGLASS_HEIGHT): Parenthesize definitions.
+
+2007-01-11  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* alloc.c (BLOCK_INPUT_ALLOC, UNBLOCK_INPUT_ALLOC): Use pthread_equal,
+	block/unblock SIGIO.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* editfns.c (Fformat): Allow integer-format to work with floats of size
@@ -58,7 +206,7 @@
 	* xterm.h (x_display_info): New: net_supported_atoms,
 	nr_net_supported_atoms and net_supported_window.
 
-	* xterm.c: New variable last_user_time.
+	* xterm.c (last_user_time): New variable.
 	(handle_one_xevent): Set last_user_time from events that have Time.
 	Set net_supported_window to 0 when reparented.
 	(wm_supports): New function.
@@ -27079,7 +27227,7 @@ See ChangeLog.9 for earlier changes.
 ;; End:
 
     Copyright (C) 2001, 2002, 2003, 2004, 2005,
-	2006 Free Software Foundation, Inc.
+	2006, 2007 Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.1 b/src/ChangeLog.1
index 94f1039f71e..4aaa3202dd6 100644
--- a/src/ChangeLog.1
+++ b/src/ChangeLog.1
@@ -3522,7 +3522,8 @@
 	* minibuf.c: Don't allow entry to minibuffer
 	while minibuffer is selected.
 
-    Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2
index 430cbc0f9da..75dd37940d0 100644
--- a/src/ChangeLog.2
+++ b/src/ChangeLog.2
@@ -4771,7 +4771,8 @@
 
 See ChangeLog.1 for earlier changes.
 
-    Copyright (C) 1986, 1987, 1988 Free Software Foundation, Inc.
+    Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006,
+	2007  Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 73f87793541..bde54ff99f9 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16531,7 +16531,8 @@
 
 See ChangeLog.2 for earlier changes.
 
-    Copyright (C) 1993 Free Software Foundation, Inc.
+    Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.4 b/src/ChangeLog.4
index b3d40b96b6c..04310b34cad 100644
--- a/src/ChangeLog.4
+++ b/src/ChangeLog.4
@@ -6903,7 +6903,8 @@
 
 See ChangeLog.3 for earlier changes.
 
-    Copyright (C) 1993, 1994 Free Software Foundation, Inc.
+    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5
index 5e50066bc78..893a6497996 100644
--- a/src/ChangeLog.5
+++ b/src/ChangeLog.5
@@ -7144,7 +7144,8 @@
 
 See ChangeLog.4 for earlier changes.
 
-    Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+    Copyright (C) 1994, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6
index 2da83619eb4..fb29238601a 100644
--- a/src/ChangeLog.6
+++ b/src/ChangeLog.6
@@ -5362,7 +5362,8 @@
 
 See ChangeLog.5 for earlier changes.
 
-    Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+    Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.7 b/src/ChangeLog.7
index f1a29903715..c38cb1fc9ca 100644
--- a/src/ChangeLog.7
+++ b/src/ChangeLog.7
@@ -11098,7 +11098,8 @@ Fri Sep 20 02:37:37 1996  Marcus Daniels  <marcus@sayre.sysc.pdx.edu>
 
 See ChangeLog.6 for earlier changes.
 
-    Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+    Copyright (C) 1997, 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.8 b/src/ChangeLog.8
index a9465058194..ff6b3b25461 100644
--- a/src/ChangeLog.8
+++ b/src/ChangeLog.8
@@ -13991,7 +13991,8 @@ Wed Jun 25 15:22:58 1997  Gerd Moellmann  <gerd@acm.org>
 
 See ChangeLog.7 for earlier changes.
 
-    Copyright (C) 1999 Free Software Foundation, Inc.
+    Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9
index 9ce75696f5a..2a644e13585 100644
--- a/src/ChangeLog.9
+++ b/src/ChangeLog.9
@@ -13294,7 +13294,8 @@ See ChangeLog.8 for earlier changes.
 ;; coding: iso-2022-7bit
 ;; End:
 
-    Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+    Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+	Free Software Foundation, Inc.
   Copying and distribution of this file, with or without modification,
   are permitted provided the copyright notice and this notice are preserved.
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 94fe5dee41f..0aa80866a38 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,6 @@
 # Makefile for GNU Emacs.
 # Copyright (C) 1985, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001, 2002,
-#               2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#               2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -402,6 +402,11 @@ LIBXT=$(LIBW)
 #endif
 #endif /* not USE_X_TOOLKIT */
 
+#if HAVE_XFT
+#undef LIB_X11_LIB
+#define LIB_X11_LIB @XFT_LIBS@
+#endif /* HAVE_XFT */
+
 #if HAVE_XPM
 #ifndef LIBXPM
 #define LIBXPM -lXpm
diff --git a/src/abbrev.c b/src/abbrev.c
index 45d00728242..7dea6969f35 100644
--- a/src/abbrev.c
+++ b/src/abbrev.c
@@ -1,6 +1,6 @@
 /* Primitives for word-abbrev mode.
    Copyright (C) 1985, 1986, 1993, 1996, 1998, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/alloc.c b/src/alloc.c
index c49d3b5becc..fe13b84b5a7 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1,6 +1,6 @@
 /* Storage allocation and gc for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999,
-      2000, 2001, 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+      2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -127,21 +127,21 @@ extern __malloc_size_t __malloc_extra_blocks;
 
 static pthread_mutex_t alloc_mutex;
 
-#define BLOCK_INPUT_ALLOC                       \
-  do                                            \
-    {                                           \
-      if (pthread_self () == main_thread)	\
-	BLOCK_INPUT;				\
-      pthread_mutex_lock (&alloc_mutex);	\
-    }                                           \
+#define BLOCK_INPUT_ALLOC                               \
+  do                                                    \
+    {                                                   \
+      if (pthread_equal (pthread_self (), main_thread)) \
+        BLOCK_INPUT;					\
+      pthread_mutex_lock (&alloc_mutex);                \
+    }                                                   \
   while (0)
-#define UNBLOCK_INPUT_ALLOC                     \
-  do                                            \
-    {                                           \
-      pthread_mutex_unlock (&alloc_mutex);	\
-      if (pthread_self () == main_thread)	\
-	UNBLOCK_INPUT;				\
-    }                                           \
+#define UNBLOCK_INPUT_ALLOC                             \
+  do                                                    \
+    {                                                   \
+      pthread_mutex_unlock (&alloc_mutex);              \
+      if (pthread_equal (pthread_self (), main_thread)) \
+        UNBLOCK_INPUT;					\
+    }                                                   \
   while (0)
 
 #else /* SYSTEM_MALLOC || not HAVE_GTK_AND_PTHREAD */
diff --git a/src/atimer.c b/src/atimer.c
index 8b092270d7b..41dd9e53a02 100644
--- a/src/atimer.c
+++ b/src/atimer.c
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/atimer.h b/src/atimer.h
index 84b1383ffdf..8c3b388d012 100644
--- a/src/atimer.h
+++ b/src/atimer.h
@@ -1,6 +1,6 @@
 /* Asynchronous timers.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/blockinput.h b/src/blockinput.h
index 78dce69fe1f..468f0e0c762 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,6 +1,6 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
-   Copyright (C) 1989, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -49,7 +49,7 @@ Boston, MA 02110-1301, USA.  */
    interrupt_input_pending to a non-zero value.  If that flag is set
    when input becomes unblocked, UNBLOCK_INPUT will send a new SIGIO.  */
 
-extern int interrupt_input_blocked;
+extern volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
diff --git a/src/buffer.c b/src/buffer.c
index 50203f1d25d..ea4752b4a6e 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -1,7 +1,7 @@
 /* Buffer manipulation primitives for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994,
                  1995, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/buffer.h b/src/buffer.h
index a5f8a6a4070..0652fdb35a8 100644
--- a/src/buffer.h
+++ b/src/buffer.h
@@ -1,6 +1,6 @@
 /* Header file for the buffer manipulation primitives.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/bytecode.c b/src/bytecode.c
index f96535354a4..4cb9e7428fd 100644
--- a/src/bytecode.c
+++ b/src/bytecode.c
@@ -1,6 +1,6 @@
 /* Execution of byte code produced by bytecomp.el.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/callint.c b/src/callint.c
index 8f118de5a59..84626031b3c 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -1,6 +1,6 @@
 /* Call a Lisp function interactively.
-   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 2000, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/callproc.c b/src/callproc.c
index eb7f8ff6252..8e7ff244697 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1,6 +1,6 @@
 /* Synchronous subprocess invocation for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/casefiddle.c b/src/casefiddle.c
index cb7c953a3e4..57fcefdde3a 100644
--- a/src/casefiddle.c
+++ b/src/casefiddle.c
@@ -1,6 +1,6 @@
 /* GNU Emacs case conversion functions.
    Copyright (C) 1985, 1994, 1997, 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/casetab.c b/src/casetab.c
index 8c46ab11c60..42c268dd7c6 100644
--- a/src/casetab.c
+++ b/src/casetab.c
@@ -1,6 +1,6 @@
 /* GNU Emacs routines to deal with case tables.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/category.c b/src/category.c
index ce238f4d399..809e326cbe9 100644
--- a/src/category.c
+++ b/src/category.c
@@ -1,7 +1,8 @@
 /* GNU Emacs routines to deal with category tables.
-   Copyright (C) 1998, 2001, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/category.h b/src/category.h
index e27f86f9a91..858a94a6224 100644
--- a/src/category.h
+++ b/src/category.h
@@ -1,6 +1,6 @@
 /* Declarations having to do with Emacs category tables.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/ccl.c b/src/ccl.c
index 49cef07650b..ded74fb6296 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1,8 +1,8 @@
 /* CCL (Code Conversion Language) interpreter.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/ccl.h b/src/ccl.h
index 1cfc8201e54..af3a92d3285 100644
--- a/src/ccl.h
+++ b/src/ccl.h
@@ -1,6 +1,6 @@
 /* Header for CCL (Code Conversion Language) interpreter.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/charset.c b/src/charset.c
index 535022c6797..0d91606da58 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1,8 +1,8 @@
 /* Basic multilingual character support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/charset.h b/src/charset.h
index 645bdafe4b2..2d0116d263e 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -1,8 +1,8 @@
 /* Header for multibyte character handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/cm.c b/src/cm.c
index 0d49ca40204..d520e740eb3 100644
--- a/src/cm.c
+++ b/src/cm.c
@@ -1,6 +1,6 @@
 /* Cursor motion subroutines for GNU Emacs.
-   Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
     based primarily on public domain code written by Chris Torek
 
 This file is part of GNU Emacs.
diff --git a/src/cm.h b/src/cm.h
index b0d7f2ce84c..a83a5bb090d 100644
--- a/src/cm.h
+++ b/src/cm.h
@@ -1,6 +1,6 @@
 /* Cursor motion calculation definitions for GNU Emacs
-   Copyright (C) 1985, 1989, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/cmds.c b/src/cmds.c
index b84b9d1d85e..7e07ce1dc6f 100644
--- a/src/cmds.c
+++ b/src/cmds.c
@@ -1,6 +1,6 @@
 /* Simple built-in editing commands.
    Copyright (C) 1985, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/coding.c b/src/coding.c
index f3008af526f..8dc20ef6a3a 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -1,8 +1,8 @@
 /* Coding system handler (conversion, detection, and etc).
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/coding.h b/src/coding.h
index c56cd04a226..fc087ccb180 100644
--- a/src/coding.h
+++ b/src/coding.h
@@ -1,8 +1,8 @@
 /* Header for coding system handler.
-   Copyright (C) 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/commands.h b/src/commands.h
index 5c7cad37407..2d0db0ec13c 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -1,6 +1,6 @@
 /* Definitions needed by most editing commands.
-   Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/composite.c b/src/composite.c
index 8e5fce2da96..3e0606e9007 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -1,7 +1,7 @@
 /* Composite sequence support.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/composite.h b/src/composite.h
index e19fcd99e73..8ff6416990f 100644
--- a/src/composite.h
+++ b/src/composite.h
@@ -1,7 +1,7 @@
 /* Header for composite sequence handler.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+                 2006, 2007 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/config.in b/src/config.in
index f0ebbc76218..71b4af0c839 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1,7 +1,7 @@
 /* src/config.in.  Generated from configure.in by autoheader.  */
 
 /* GNU Emacs site configuration template file.
-   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006
+   Copyright (C) 1988, 1993, 1994, 1999, 2000, 2001, 2002, 2004, 2005, 2006, 2007
              Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
@@ -713,6 +713,9 @@ Boston, MA 02110-1301, USA.  */
 /* Define to 1 if you're using XFree386. */
 #undef HAVE_XFREE386
 
+/* Define to 1 if you have the Xft library. */
+#undef HAVE_XFT
+
 /* Define to 1 if XIM is available */
 #undef HAVE_XIM
 
diff --git a/src/cxux-crt0.s b/src/cxux-crt0.s
index b05faf57b8e..9a359a44955 100644
--- a/src/cxux-crt0.s
+++ b/src/cxux-crt0.s
@@ -1,7 +1,7 @@
 /*
  * External symbol setup file for GNU Emacs on CX/UX
  * Copyright (C) 1990, 2002, 2003, 2004, 2005,
- *               2006 Free Software Foundation, Inc.
+ *               2006, 2007 Free Software Foundation, Inc.
  *
  * This file is part of GNU Emacs.
  *
diff --git a/src/data.c b/src/data.c
index dc9095c033c..2f682450a16 100644
--- a/src/data.c
+++ b/src/data.c
@@ -1,6 +1,6 @@
 /* Primitive operations on Lisp data types for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dired.c b/src/dired.c
index 7b8f978b20c..c542f8019db 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -930,6 +930,7 @@ Elements of the attribute list are:
   char modes[10];
   Lisp_Object handler;
   struct gcpro gcpro1;
+  EMACS_INT uid, gid, ino;
 
   filename = Fexpand_file_name (filename, Qnil);
 
@@ -964,20 +965,26 @@ Elements of the attribute list are:
 #endif
     }
   values[1] = make_number (s.st_nlink);
+  /* When make_fixnum_or_float is called below with types that are
+     shorter than an int (e.g., `short'), GCC whines about comparison
+     being always false due to limited range of data type.  Fix by
+     copying s.st_uid and s.st_gid into int variables.  */
+  uid = s.st_uid;
+  gid = s.st_gid;
   if (NILP (id_format) || EQ (id_format, Qinteger))
     {
-      values[2] = make_fixnum_or_float (s.st_uid);
-      values[3] = make_fixnum_or_float (s.st_gid);
+      values[2] = make_fixnum_or_float (uid);
+      values[3] = make_fixnum_or_float (gid);
     }
   else
     {
       BLOCK_INPUT;
-      pw = (struct passwd *) getpwuid (s.st_uid);
+      pw = (struct passwd *) getpwuid (uid);
       values[2] = (pw ? build_string (pw->pw_name)
-                  : make_fixnum_or_float (s.st_uid));
-      gr = (struct group *) getgrgid (s.st_gid);
+                  : make_fixnum_or_float (uid));
+      gr = (struct group *) getgrgid (gid);
       values[3] = (gr ? build_string (gr->gr_name)
-                  : make_fixnum_or_float (s.st_gid));
+                  : make_fixnum_or_float (gid));
       UNBLOCK_INPUT;
     }
   values[4] = make_time (s.st_atime);
@@ -999,20 +1006,22 @@ Elements of the attribute list are:
   if (! NILP (dirname))
     encoded = ENCODE_FILE (dirname);
   if (! NILP (dirname) && stat (SDATA (encoded), &sdir) == 0)
-    values[9] = (sdir.st_gid != s.st_gid) ? Qt : Qnil;
+    values[9] = (sdir.st_gid != gid) ? Qt : Qnil;
   else					/* if we can't tell, assume worst */
     values[9] = Qt;
 #else					/* file gid will be egid */
-  values[9] = (s.st_gid != getegid ()) ? Qt : Qnil;
+  values[9] = (gid != getegid ()) ? Qt : Qnil;
 #endif	/* BSD4_2 (or BSD4_3) */
-  if (FIXNUM_OVERFLOW_P (s.st_ino))
+  /* Shut up GCC warnings in FIXNUM_OVERFLOW_P below.  */
+  ino = s.st_ino;
+  if (FIXNUM_OVERFLOW_P (ino))
     /* To allow inode numbers larger than VALBITS, separate the bottom
        16 bits.  */
-    values[10] = Fcons (make_number (s.st_ino >> 16),
-			make_number (s.st_ino & 0xffff));
+    values[10] = Fcons (make_number (ino >> 16),
+			make_number (ino & 0xffff));
   else
     /* But keep the most common cases as integers.  */
-    values[10] = make_number (s.st_ino);
+    values[10] = make_number (ino);
 
   /* Likewise for device.  */
   if (FIXNUM_OVERFLOW_P (s.st_dev))
diff --git a/src/dispextern.h b/src/dispextern.h
index 1198838c17d..4c3bd56e121 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1,6 +1,6 @@
 /* Interface definitions for display code.
    Copyright (C) 1985, 1993, 1994, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dispnew.c b/src/dispnew.c
index 5ace8ac2985..c2a37f8248e 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1,7 +1,7 @@
 /* Updating of data structures for redisplay.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4394,12 +4394,12 @@ update_text_area (w, vpos)
       || desired_row->phys_height != current_row->phys_height
       || desired_row->visible_height != current_row->visible_height
       || current_row->overlapped_p
-#if 0
-      /* This causes excessive flickering when mouse is moved across
-	 the mode line.  Luckily everything seems to work just fine
-	 without doing this.  KFS 2006-09-17.  */
-      || current_row->mouse_face_p
-#endif
+      /* This next line is necessary for correctly redrawing
+	 mouse-face areas after scrolling and other operations.
+	 However, it causes excessive flickering when mouse is moved
+	 across the mode line.  Luckily, turning it off for the mode
+	 line doesn't seem to hurt anything. -- cyd.  */
+      || (current_row->mouse_face_p && !current_row->mode_line_p)
       || current_row->x != desired_row->x)
     {
       rif->cursor_to (vpos, 0, desired_row->y, desired_row->x);
diff --git a/src/disptab.h b/src/disptab.h
index 80936fb1830..e20f3e27631 100644
--- a/src/disptab.h
+++ b/src/disptab.h
@@ -1,6 +1,6 @@
 /* Things for GLYPHS and glyph tables.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/doc.c b/src/doc.c
index 93f372606a4..be52f8aa07e 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -1,6 +1,6 @@
 /* Record indices of function doc strings stored in a file.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/doprnt.c b/src/doprnt.c
index 63c0261e6ae..326fb5743e2 100644
--- a/src/doprnt.c
+++ b/src/doprnt.c
@@ -1,8 +1,8 @@
 /* Output like sprintf to a buffer of specified size.
    Also takes args differently: pass one pointer to an array of strings
    in addition to the format string which is separate.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.c b/src/dosfns.c
index 92b90e530da..e57a6a197be 100644
--- a/src/dosfns.c
+++ b/src/dosfns.c
@@ -1,7 +1,7 @@
 /* MS-DOS specific Lisp utilities.  Coded by Manabu Higashida, 1991.
    Major changes May-July 1993 Morten Welinder (only 10% original code left)
    Copyright (C) 1991, 1993, 1996, 1997, 1998, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/dosfns.h b/src/dosfns.h
index 4f1cfd83d22..622e7cb5335 100644
--- a/src/dosfns.h
+++ b/src/dosfns.h
@@ -2,8 +2,8 @@
    Coded by Manabu Higashida, 1991.
    Modified by Morten Welinder, 1993-1994.
 
-   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1991, 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ecrt0.c b/src/ecrt0.c
index a9b993d360e..7f94f07dc00 100644
--- a/src/ecrt0.c
+++ b/src/ecrt0.c
@@ -1,6 +1,6 @@
 /* C code startup routine.
-   Copyright (C) 1985, 1986, 1992, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/editfns.c b/src/editfns.c
index ab29a07b693..6ef2efe313e 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1314,7 +1314,10 @@ DEFUN ("user-uid", Fuser_uid, Suser_uid, 0, 0, 0,
 Value is an integer or float, depending on the value.  */)
      ()
 {
-  return make_fixnum_or_float (geteuid ());
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT euid = geteuid ();
+  return make_fixnum_or_float (euid);
 }
 
 DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0,
@@ -1322,7 +1325,10 @@ DEFUN ("user-real-uid", Fuser_real_uid, Suser_real_uid, 0, 0, 0,
 Value is an integer or float, depending on the value.  */)
      ()
 {
-  return make_fixnum_or_float (getuid ());
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT uid = getuid ();
+  return make_fixnum_or_float (uid);
 }
 
 DEFUN ("user-full-name", Fuser_full_name, Suser_full_name, 0, 1, 0,
@@ -1450,9 +1456,9 @@ most significant 16 bits of the seconds, while the second has the
 least significant 16 bits.  The third integer gives the microsecond
 count.
 
-On systems that can't determine the run time, get-internal-run-time
-does the same thing as current-time.  The microsecond count is zero on
-systems that do not provide resolution finer than a second.  */)
+On systems that can't determine the run time, `get-internal-run-time'
+does the same thing as `current-time'.  The microsecond count is zero
+on systems that do not provide resolution finer than a second.  */)
      ()
 {
 #ifdef HAVE_GETRUSAGE
@@ -1715,7 +1721,7 @@ For example, to produce full ISO 8601 format, use "%Y-%m-%dT%T%z".  */)
 DEFUN ("decode-time", Fdecode_time, Sdecode_time, 0, 1, 0,
        doc: /* Decode a time value as (SEC MINUTE HOUR DAY MONTH YEAR DOW DST ZONE).
 The optional SPECIFIED-TIME should be a list of (HIGH LOW . IGNORED),
-as from `current-time' and `file-attributes', or `nil' to use the
+as from `current-time' and `file-attributes', or nil to use the
 current time.  The obsolete form (HIGH . LOW) is also still accepted.
 The list has the following nine members: SEC is an integer between 0
 and 60; SEC is 60 for a leap second, which only some operating systems
@@ -2279,8 +2285,7 @@ usage: (insert-before-markers-and-inherit &rest ARGS)  */)
 }
 
 DEFUN ("insert-char", Finsert_char, Sinsert_char, 2, 3, 0,
-       doc: /* Insert COUNT (second arg) copies of CHARACTER (first arg).
-Both arguments are required.
+       doc: /* Insert COUNT copies of CHARACTER.
 Point, and before-insertion markers, are relocated as in the function `insert'.
 The optional third arg INHERIT, if non-nil, says to inherit text properties
 from adjoining text, if those properties are sticky.  */)
@@ -3169,7 +3174,7 @@ save_restriction_restore (data)
 DEFUN ("save-restriction", Fsave_restriction, Ssave_restriction, 0, UNEVALLED, 0,
        doc: /* Execute BODY, saving and restoring current buffer's restrictions.
 The buffer's restrictions make parts of the beginning and end invisible.
-(They are set up with `narrow-to-region' and eliminated with `widen'.)
+\(They are set up with `narrow-to-region' and eliminated with `widen'.)
 This special form, `save-restriction', saves the current buffer's restrictions
 when it is entered, and restores them when it is exited.
 So any `narrow-to-region' within BODY lasts only until the end of the form.
diff --git a/src/emacs.c b/src/emacs.c
index d068ee767bf..d49d81e70bb 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -867,7 +867,7 @@ main (argc, argv
       else
 	{
 	  printf ("GNU Emacs %s\n", SDATA (tem));
-	  printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
+	  printf ("Copyright (C) 2007 Free Software Foundation, Inc.\n");
 	  printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
 	  printf ("You may redistribute copies of Emacs\n");
 	  printf ("under the terms of the GNU General Public License.\n");
diff --git a/src/epaths.in b/src/epaths.in
index d494d85139c..34d97897c7d 100644
--- a/src/epaths.in
+++ b/src/epaths.in
@@ -1,6 +1,6 @@
 /* Hey Emacs, this is -*- C -*- code!  */
 /* Copyright (C) 1993, 1995, 1997, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -52,7 +52,7 @@ Boston, MA 02110-1301, USA.  */
 /* Where the configuration process believes the info tree lives.  The
    lisp variable configure-info-directory gets its value from this
    macro, and is then used to set the Info-default-directory-list.  */
-#define PATH_INFO "/usr/local/info"
+#define PATH_INFO "/usr/local/share/info"
 
 /* Where Emacs should store game score files.  */
 #define PATH_GAME "/usr/local/var/games/emacs"
diff --git a/src/eval.c b/src/eval.c
index c587142762e..b1bd3daef7a 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -1,6 +1,6 @@
 /* Evaluator for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fileio.c b/src/fileio.c
index f41699bcc46..074a7a0527c 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -1,7 +1,7 @@
 /* File IO for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1996,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/filelock.c b/src/filelock.c
index 6e8e6da9fbd..689a80a4209 100644
--- a/src/filelock.c
+++ b/src/filelock.c
@@ -1,6 +1,6 @@
 /* Lock files for editing.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1996, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/filemode.c b/src/filemode.c
index 835a8a3778e..b15f65c1647 100644
--- a/src/filemode.c
+++ b/src/filemode.c
@@ -1,6 +1,6 @@
 /* filemode.c -- make a string describing file modes
-   Copyright (C) 1985, 1990, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/firstfile.c b/src/firstfile.c
index 06e7022d89a..8093f03efc3 100644
--- a/src/firstfile.c
+++ b/src/firstfile.c
@@ -1,6 +1,6 @@
 /* Mark beginning of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1997, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1997, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/floatfns.c b/src/floatfns.c
index dd879de7eb8..e0ed9b625cd 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -1,6 +1,6 @@
 /* Primitive operations on floating point for GNU Emacs Lisp interpreter.
-   Copyright (C) 1988, 1993, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1993, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fns.c b/src/fns.c
index 709b58882ef..c75c4d68cf3 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -1,7 +1,7 @@
 /* Random utility Lisp functions.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -4671,6 +4671,7 @@ maybe_resize_hash_table (h)
     {
       int old_size = HASH_TABLE_SIZE (h);
       int i, new_size, index_size;
+      EMACS_INT nsize;
 
       if (INTEGERP (h->rehash_size))
 	new_size = old_size + XFASTINT (h->rehash_size);
@@ -4680,7 +4681,10 @@ maybe_resize_hash_table (h)
       index_size = next_almost_prime ((int)
 				      (new_size
 				       / XFLOATINT (h->rehash_threshold)));
-      if (max (index_size, 2 * new_size) > MOST_POSITIVE_FIXNUM)
+      /* Assignment to EMACS_INT stops GCC whining about limited range
+	 of data type.  */
+      nsize = max (index_size, 2 * new_size);
+      if (nsize > MOST_POSITIVE_FIXNUM)
 	error ("Hash table too large to resize");
 
       h->key_and_value = larger_vector (h->key_and_value, 2 * new_size, Qnil);
diff --git a/src/fontset.c b/src/fontset.c
index 66a31e9acf0..7d227d8f43f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1,7 +1,8 @@
 /* Fontset handler.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007
+     Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/fontset.h b/src/fontset.h
index a08f7b74bd0..a2bac100396 100644
--- a/src/fontset.h
+++ b/src/fontset.h
@@ -1,8 +1,8 @@
 /* Header for fontset handler.
-   Copyright (C) 1998, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1998, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-     2005, 2006
+     2005, 2006, 2007
      National Institute of Advanced Industrial Science and Technology (AIST)
      Registration Number H14PRO021
 
diff --git a/src/frame.c b/src/frame.c
index b6f361bcbfe..7d5bdcb1cb6 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -1,6 +1,6 @@
 /* Generic frame functions.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/frame.h b/src/frame.h
index 9f22d1c08ab..47f7483994e 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -1,6 +1,6 @@
 /* Define frame-object for GNU Emacs.
    Copyright (C) 1993, 1994, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/fringe.c b/src/fringe.c
index dd885beb1b6..2fb88ce01e8 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1,7 +1,7 @@
 /* Fringe handling (split from xdisp.c).
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1997,
-                 1998, 1999, 2000, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/getloadavg.c b/src/getloadavg.c
index 3f616b47116..f40149a8c47 100644
--- a/src/getloadavg.c
+++ b/src/getloadavg.c
@@ -1,6 +1,7 @@
 /* Get the system load averages.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1991, 1992, 1993, 1994, 1995,
-                 1997, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 1997, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/getpagesize.h b/src/getpagesize.h
index f38409da452..c4551677d16 100644
--- a/src/getpagesize.h
+++ b/src/getpagesize.h
@@ -1,6 +1,6 @@
 /* Emulate getpagesize on systems that lack it.
    Copyright (C) 1986, 1992, 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/gmalloc.c b/src/gmalloc.c
index 646fbbc4e4c..3f32617fc64 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -6,7 +6,7 @@
 
 /* Declarations for `malloc' and friends.
    Copyright (C) 1990, 1991, 1992, 1993, 1995, 1996, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 		  Written May 1989 by Mike Haertel.
 
 This library is free software; you can redistribute it and/or
diff --git a/src/gtkutil.c b/src/gtkutil.c
index d57a0b56c0c..7953ce30740 100644
--- a/src/gtkutil.c
+++ b/src/gtkutil.c
@@ -1,5 +1,5 @@
 /* Functions for creating and updating GTK widgets.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3937,6 +3937,11 @@ xg_initialize ()
 {
   GtkBindingSet *binding_set;
 
+#if HAVE_XFT
+  /* Work around a bug with corrupted data if libXft gets unloaded.  This way
+     we keep it permanently linked in.  */
+  XftInit (0);
+#endif
   xg_ignore_gtk_scrollbar = 0;
   xg_detached_menus = 0;
   xg_menu_cb_list.prev = xg_menu_cb_list.next =
diff --git a/src/gtkutil.h b/src/gtkutil.h
index c3957223a18..f87583ea1c2 100644
--- a/src/gtkutil.h
+++ b/src/gtkutil.h
@@ -1,5 +1,5 @@
 /* Definitions and headers for GTK widgets.
-   Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/image.c b/src/image.c
index b4ee3104543..49d25d819bc 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1,6 +1,6 @@
 /* Functions for image support on window system.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/indent.c b/src/indent.c
index af556bc38e3..bb77de1be9b 100644
--- a/src/indent.c
+++ b/src/indent.c
@@ -1,6 +1,6 @@
 /* Indentation functions.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1998, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/indent.h b/src/indent.h
index ddfd16a16de..b9c39869e60 100644
--- a/src/indent.h
+++ b/src/indent.h
@@ -1,6 +1,6 @@
 /* Definitions for interface to indent.c
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/insdel.c b/src/insdel.c
index bd6e30d9449..08043147cdf 100644
--- a/src/insdel.c
+++ b/src/insdel.c
@@ -1,6 +1,6 @@
 /* Buffer insertion/deletion and gap motion for GNU Emacs.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.c b/src/intervals.c
index 20c4c191a93..861cb24c598 100644
--- a/src/intervals.c
+++ b/src/intervals.c
@@ -1,6 +1,6 @@
 /* Code for doing intervals.
-   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/intervals.h b/src/intervals.h
index 052b55d5a3c..f89b748f2ff 100644
--- a/src/intervals.h
+++ b/src/intervals.h
@@ -1,6 +1,6 @@
 /* Definitions and global variables for intervals.
-   Copyright (C) 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keyboard.c b/src/keyboard.c
index c2603427004..82e97441667 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -1,7 +1,7 @@
 /* Keyboard and mouse input; editor command loop.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
                  1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -89,7 +89,7 @@ extern int errno;
 /* Variables for blockinput.h: */
 
 /* Non-zero if interrupt input is blocked right now.  */
-int interrupt_input_blocked;
+volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
@@ -9493,7 +9493,8 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last,
 		    {
 		      pos = POSN_BUFFER_POSN (start);
 		      if (INTEGERP (pos)
-			  && XINT (pos) >= BEG && XINT (pos) <= Z)
+			  && XINT (pos) >= BEGV
+			  && XINT (pos) <= ZV)
 			{
 			  map_here = get_local_map (XINT (pos),
 						    current_buffer, Qlocal_map);
@@ -10507,7 +10508,9 @@ DEFUN ("this-command-keys", Fthis_command_keys, Sthis_command_keys, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command.
 However, if the command has called `read-key-sequence', it returns
 the last key sequence that has been read.
-The value is a string or a vector.  */)
+The value is a string or a vector.
+
+See also `this-command-keys-vector'.  */)
      ()
 {
   return make_event_array (this_command_key_count,
@@ -10517,7 +10520,9 @@ The value is a string or a vector.  */)
 DEFUN ("this-command-keys-vector", Fthis_command_keys_vector, Sthis_command_keys_vector, 0, 0, 0,
        doc: /* Return the key sequence that invoked this command, as a vector.
 However, if the command has called `read-key-sequence', it returns
-the last key sequence that has been read.  */)
+the last key sequence that has been read.
+
+See also `this-command-keys'.  */)
      ()
 {
   return Fvector (this_command_key_count,
diff --git a/src/keyboard.h b/src/keyboard.h
index 749a8aefb28..0879bacc156 100644
--- a/src/keyboard.h
+++ b/src/keyboard.h
@@ -1,6 +1,6 @@
 /* Declarations useful when processing input.
-   Copyright (C) 1985, 1986, 1987, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/keymap.c b/src/keymap.c
index 634a52b3834..c85c37aae12 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1,7 +1,7 @@
 /* Manipulation of keymaps
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3448,9 +3448,13 @@ describe_map (map, prefix, elt_describer, partial, shadow,
 	      tem = shadow_lookup (shadow, kludge, Qt);
 	      if (!NILP (tem))
 		{
+		  /* If both bindings are keymaps, this key is a prefix key,
+		     so don't say it is shadowed.  */
+		  if (KEYMAPP (definition) && KEYMAPP (tem))
+		    ;
 		  /* Avoid generating duplicate entries if the
-		     shadowed binding has the same definition. */
-		  if (mention_shadow && !EQ (tem, definition))
+		     shadowed binding has the same definition.  */
+		  else if (mention_shadow && !EQ (tem, definition))
 		    this_shadowed = 1;
 		  else
 		    continue;
diff --git a/src/keymap.h b/src/keymap.h
index 271a2e64284..9614f578f37 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -1,6 +1,6 @@
 /* Functions to manipulate keymaps.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lastfile.c b/src/lastfile.c
index 7c5e067dd02..7a7888f4683 100644
--- a/src/lastfile.c
+++ b/src/lastfile.c
@@ -1,6 +1,6 @@
 /* Mark end of data space to dump as pure, for GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lisp.h b/src/lisp.h
index f5d936089cf..7a03836021b 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -1,6 +1,6 @@
 /* Fundamental definitions for GNU Emacs Lisp interpreter.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/lread.c b/src/lread.c
index 9142e0c6dcd..0014c31c45d 100644
--- a/src/lread.c
+++ b/src/lread.c
@@ -1,7 +1,7 @@
 /* Lisp parsing and input streams.
    Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/7300.h b/src/m/7300.h
index a8751efa52a..1022e077046 100644
--- a/src/m/7300.h
+++ b/src/m/7300.h
@@ -1,6 +1,6 @@
 /* machine description file for AT&T UNIX PC model 7300
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Modified for this machine by mtxinu!rtech!gonzo!daveb
 
 This file is part of GNU Emacs.
diff --git a/src/m/acorn.h b/src/m/acorn.h
index 326fb7760ae..dee60071e12 100644
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -1,6 +1,6 @@
 /* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index d56624a1eac..e81fe48b9e7 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -1,6 +1,6 @@
 /* alliant-2800.h - Alliant FX/2800 machine running Concentrix 2800.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/alliant.h b/src/m/alliant.h
index 49459c0b7f7..5ddab96012f 100644
--- a/src/m/alliant.h
+++ b/src/m/alliant.h
@@ -1,6 +1,6 @@
 /* alliant.h  Alliant machine running system version 2 or 3.
-   Copyright (C) 1985, 1986, 1987, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Note that for version 1 of the Alliant system
    you should use alliant1.h instead of this file.
    Use alliant4.h for version 4.
diff --git a/src/m/alpha.h b/src/m/alpha.h
index 47003400846..cf629c20291 100644
--- a/src/m/alpha.h
+++ b/src/m/alpha.h
@@ -1,6 +1,6 @@
 /* machine description file For the alpha chip.
-   Copyright (C) 1994, 1997, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1997, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/altos.h b/src/m/altos.h
index 16e7fb7ce06..1a7c6d4f95a 100644
--- a/src/m/altos.h
+++ b/src/m/altos.h
@@ -1,6 +1,6 @@
 /* altos machine description file	Altos 3068 Unix System V Release 2
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/amdahl.h b/src/m/amdahl.h
index e418e3a43bf..c5cae1fc560 100644
--- a/src/m/amdahl.h
+++ b/src/m/amdahl.h
@@ -1,6 +1,6 @@
 /* amdahl machine description file
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/amdx86-64.h b/src/m/amdx86-64.h
index 36e62ef6166..0dcf5524645 100644
--- a/src/m/amdx86-64.h
+++ b/src/m/amdx86-64.h
@@ -1,5 +1,5 @@
 /* machine description file for AMD x86-64.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/apollo.h b/src/m/apollo.h
index d9b3cffdb6d..0e6e53327bc 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -1,6 +1,6 @@
 /* machine description file for Apollo machine.
-   Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/arm.h b/src/m/arm.h
index 0a49f0cbd4b..18675f2805c 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -1,6 +1,6 @@
 /* Machine description file for ARM-based non-RISCiX machines.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/att3b.h b/src/m/att3b.h
index 049593ebcf4..33411ff005c 100644
--- a/src/m/att3b.h
+++ b/src/m/att3b.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for AT&T 3b machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
    Modified by David Robinson (daver@csvax.caltech.edu) 6/6/86
 
diff --git a/src/m/aviion.h b/src/m/aviion.h
index 50355b25bd6..87b7d963f5a 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -1,6 +1,6 @@
 /* machine description file for Data General AViiON.
-   Copyright (C) 1985, 1986, 1991, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1991, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/celerity.h b/src/m/celerity.h
index 10d38e14c6c..0eba349b7db 100644
--- a/src/m/celerity.h
+++ b/src/m/celerity.h
@@ -1,6 +1,6 @@
 /* machine description file for Celerity.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/clipper.h b/src/m/clipper.h
index 0dfa13382b3..6851761d53e 100644
--- a/src/m/clipper.h
+++ b/src/m/clipper.h
@@ -1,6 +1,6 @@
 /* machine description file for clipper
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cnvrgnt.h b/src/m/cnvrgnt.h
index f8df583657a..09e3365bee9 100644
--- a/src/m/cnvrgnt.h
+++ b/src/m/cnvrgnt.h
@@ -1,6 +1,6 @@
 /* machine description file for convergent S series.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/convex.h b/src/m/convex.h
index fa87d89e3d3..2904b5942f4 100644
--- a/src/m/convex.h
+++ b/src/m/convex.h
@@ -1,6 +1,6 @@
 /* machine description file for Convex (all models).
-   Copyright (C) 1987, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/cydra5.h b/src/m/cydra5.h
index a64f4761c25..75aca4b0e64 100644
--- a/src/m/cydra5.h
+++ b/src/m/cydra5.h
@@ -1,6 +1,6 @@
 /* machine description file for Cydrome's CYDRA 5 mini super computer
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/delta88k.h b/src/m/delta88k.h
index 86e416e887d..7017e38284e 100644
--- a/src/m/delta88k.h
+++ b/src/m/delta88k.h
@@ -1,6 +1,6 @@
 /* Machine description file for Motorola System V/88 machines
-   Copyright (C) 1985, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dpx2.h b/src/m/dpx2.h
index 2a90ff46284..de0b93b21ac 100644
--- a/src/m/dpx2.h
+++ b/src/m/dpx2.h
@@ -1,6 +1,6 @@
 /* machine description for Bull DPX/2 range
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/dual.h b/src/m/dual.h
index d02ac5bc38e..63829b75d2e 100644
--- a/src/m/dual.h
+++ b/src/m/dual.h
@@ -1,6 +1,6 @@
 /* machine description file for Dual machines using unisoft port.
-   Copyright (C) 1985, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/elxsi.h b/src/m/elxsi.h
index 0cb0c5513bf..c264d57338b 100644
--- a/src/m/elxsi.h
+++ b/src/m/elxsi.h
@@ -1,6 +1,6 @@
 /* machine description file for Elxsi machine (running enix).
-   Copyright (C) 1986, 1992, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Adapted by John Salmon
 
 This file is part of GNU Emacs.
diff --git a/src/m/ews4800.h b/src/m/ews4800.h
index 9db133ba682..528ce95d685 100644
--- a/src/m/ews4800.h
+++ b/src/m/ews4800.h
@@ -1,6 +1,6 @@
 /* m- file for NEC EWS4800 RISC series.
    Copyright (C) 1998, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/gould-np1.h b/src/m/gould-np1.h
index 272a06cf305..a750c9f8f39 100644
--- a/src/m/gould-np1.h
+++ b/src/m/gould-np1.h
@@ -1,6 +1,6 @@
 /* machine description file for Gould NP1 with UTX/32 3.0 (first release for NP1)
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/gould.h b/src/m/gould.h
index 3b5f1494e78..0b422f18fe2 100644
--- a/src/m/gould.h
+++ b/src/m/gould.h
@@ -6,7 +6,7 @@
 * official releases of 2.1
 
    Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/hp800.h b/src/m/hp800.h
deleted file mode 100644
index 1630a0bc883..00000000000
--- a/src/m/hp800.h
+++ /dev/null
@@ -1,187 +0,0 @@
-/* machine description file for hp9000 series 800 machines.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#	define hp9000s800
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short. */
-
-
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-/* Common definitions for HPUX and GNU/Linux.  */
-
-#if defined (__hpux) || defined (GNU_LINUX)
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#     define hp9000s800
-#endif
-
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#undef CANNOT_DUMP
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-#endif /* __hpux or GNU_LINUX */
-
-/* Stuff for just GNU/Linux.  */
-
-#ifdef GNU_LINUX
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE long
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) (int) (((double) (x)) * 100.0 / FSCALE)
-
-#endif /* GNU_LINUX */
-
-/* Stuff for just HPUX.  */
-
-#ifdef __hpux
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-#define NEED_BSDTTY
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-#endif /* __hpux */
-
-/* Systems with GCC don't need to lose. */
-#ifdef __NetBSD__
-# ifdef __GNUC__
-#  define alloca __builtin_alloca
-#  define HAVE_ALLOCA
-# endif /* __GNUC__ */
-#endif /* __NetBSD__ */
-
-/* arch-tag: 809436e6-1645-4b92-b40d-2de5d6e7227c
-   (do not change this comment) */
diff --git a/src/m/hp9000s300.h b/src/m/hp9000s300.h
index 9760b9bd2ed..c02a68d31cc 100644
--- a/src/m/hp9000s300.h
+++ b/src/m/hp9000s300.h
@@ -1,6 +1,6 @@
 /* machine description file for hp9000 series 200 or 300 on either HPUX or BSD.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/i860.h b/src/m/i860.h
index d74a01a889c..6af68cc2ae7 100644
--- a/src/m/i860.h
+++ b/src/m/i860.h
@@ -1,6 +1,6 @@
 /* machine description file for i860.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ia64.h b/src/m/ia64.h
index 560cd30f599..7e88aeaedc8 100644
--- a/src/m/ia64.h
+++ b/src/m/ia64.h
@@ -1,6 +1,6 @@
 /* machine description file for the IA-64 architecture.
-   Copyright (C) 2000, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
      Contributed by David Mosberger <davidm@hpl.hp.com>
 
 This file is part of GNU Emacs.
diff --git a/src/m/ibm370aix.h b/src/m/ibm370aix.h
index 1a9ed6efe11..09460092b3e 100644
--- a/src/m/ibm370aix.h
+++ b/src/m/ibm370aix.h
@@ -1,6 +1,6 @@
 /* m/ file for IBM 370 running AIX.
    Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmps2-aix.h b/src/m/ibmps2-aix.h
index ea895cd4fd8..c8449baef41 100644
--- a/src/m/ibmps2-aix.h
+++ b/src/m/ibmps2-aix.h
@@ -1,6 +1,6 @@
 /* machine description file for ibm ps/2 aix386.
-   Copyright (C) 1989, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 10b43bf8246..6729282953e 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,6 +1,6 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrt-aix.h b/src/m/ibmrt-aix.h
index 43e11b36428..ccee40a46a9 100644
--- a/src/m/ibmrt-aix.h
+++ b/src/m/ibmrt-aix.h
@@ -1,6 +1,6 @@
 /* RTPC AIX machine/system dependent defines
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index e78d182940c..2cf372a278d 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -1,6 +1,6 @@
 /* RTPC machine dependent defines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibms390.h b/src/m/ibms390.h
index d60b33fdd04..e038e2e1b52 100644
--- a/src/m/ibms390.h
+++ b/src/m/ibms390.h
@@ -1,6 +1,6 @@
 /* machine description file template.
    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 716dd44c727..f8b21bc3df4 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -1,5 +1,5 @@
 /* machine description file for IBM S390 in 64-bit mode
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/intel386.h b/src/m/intel386.h
index 0d2aacf8d19..44ba3245b2e 100644
--- a/src/m/intel386.h
+++ b/src/m/intel386.h
@@ -1,6 +1,6 @@
 /* Machine description file for intel 386.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/iris4d.h b/src/m/iris4d.h
index bc8d1242710..4304871ca23 100644
--- a/src/m/iris4d.h
+++ b/src/m/iris4d.h
@@ -1,6 +1,6 @@
 /* machine description file for Iris-4D machines.  Use with s/irix*.h.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/irist.h b/src/m/irist.h
index a366b521a9a..4ae3681bd92 100644
--- a/src/m/irist.h
+++ b/src/m/irist.h
@@ -1,7 +1,7 @@
 /* machine description file for Silicon Graphics Iris 2500 Turbos;
    also possibly for non-turbo Irises with system release 2.5.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/isi-ov.h b/src/m/isi-ov.h
index 5b6c3cd0214..ed96605b5a1 100644
--- a/src/m/isi-ov.h
+++ b/src/m/isi-ov.h
@@ -1,6 +1,6 @@
 /* machine description file for ISI 68000's
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/m68k.h b/src/m/m68k.h
index 31307ffa499..1071847eda9 100644
--- a/src/m/m68k.h
+++ b/src/m/m68k.h
@@ -1,6 +1,6 @@
 /* Machine description file for generic Motorola 68k.
-   Copyright (C) 1985, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/macppc.h b/src/m/macppc.h
index 25005888c77..eba0a401a18 100644
--- a/src/m/macppc.h
+++ b/src/m/macppc.h
@@ -1,6 +1,6 @@
 /* machine description file For the powerpc Macintosh.
    Copyright (C) 1994, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/masscomp.h b/src/m/masscomp.h
index df0d9a1aa1a..777ff797727 100644
--- a/src/m/masscomp.h
+++ b/src/m/masscomp.h
@@ -1,6 +1,6 @@
 /* machine description file for Masscomp 5000 series running RTU, ucb universe.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mega68.h b/src/m/mega68.h
index 7db67fa0cca..54340bdb0be 100644
--- a/src/m/mega68.h
+++ b/src/m/mega68.h
@@ -1,6 +1,6 @@
 /* machine description file for Megatest 68000's.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/mg1.h b/src/m/mg1.h
index 92e358837c4..b0d6faca500 100644
--- a/src/m/mg1.h
+++ b/src/m/mg1.h
@@ -1,6 +1,6 @@
 /* machine description file for Whitechapel Computer Works MG1 (ns16000 based).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    MG-1 version by L.M.McLoughlin
 
 This file is part of GNU Emacs.
diff --git a/src/m/mips-siemens.h b/src/m/mips-siemens.h
index 27274c8b527..376f8805788 100644
--- a/src/m/mips-siemens.h
+++ b/src/m/mips-siemens.h
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
    This file contains some changes for our SVR4 based SINIX-Mips 5.4.
    I hope this is helpful to port the emacs to our RM?00 series and
diff --git a/src/m/mips.h b/src/m/mips.h
index 9ae74178143..ee8e63030c7 100644
--- a/src/m/mips.h
+++ b/src/m/mips.h
@@ -1,6 +1,6 @@
 /* m- file for Mips machines.
-   Copyright (C) 1987, 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/news.h b/src/m/news.h
index 5ac2cd6b6dc..13a718a8612 100644
--- a/src/m/news.h
+++ b/src/m/news.h
@@ -1,6 +1,6 @@
 /* machine description file for Sony's NEWS workstations, NEWS-OS 3.0.
-   Copyright (C) 1985, 1986, 1989, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1989, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/next.h b/src/m/next.h
index b519e41920d..2a0f7243772 100644
--- a/src/m/next.h
+++ b/src/m/next.h
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXT machine.
-   Copyright (C) 1990, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh3000.h b/src/m/nh3000.h
index ad2d8dd1340..e5cf1a61b58 100644
--- a/src/m/nh3000.h
+++ b/src/m/nh3000.h
@@ -1,8 +1,8 @@
 /* machine description for Harris Night Hawk Series 1200 and Series 3000
    MC68030-based systems (FPP on these is custom).  These systems are
    also known as "ecx" and "gcx".
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nh4000.h b/src/m/nh4000.h
index 1c0bc51c896..ba695700d77 100644
--- a/src/m/nh4000.h
+++ b/src/m/nh4000.h
@@ -1,7 +1,7 @@
 /* machine description for Harris NightHawk 88k based machines
    (includes nh4000 and nh5000 machines).
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns16000.h b/src/m/ns16000.h
index 5e9793a44b8..707cb21abb7 100644
--- a/src/m/ns16000.h
+++ b/src/m/ns16000.h
@@ -1,6 +1,6 @@
 /* machine description file for ns16000.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ns32000.h b/src/m/ns32000.h
index 33e48d297bc..fe1fd153b70 100644
--- a/src/m/ns32000.h
+++ b/src/m/ns32000.h
@@ -1,6 +1,6 @@
 /* machine description file for National Semiconductor 32000, running Genix.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/nu.h b/src/m/nu.h
index ec051150bdf..01fadeba18a 100644
--- a/src/m/nu.h
+++ b/src/m/nu.h
@@ -1,6 +1,6 @@
 /* machine description file for TI Nu machines using system V.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion.h b/src/m/orion.h
index 3db485dd3f1..472b7b4c8eb 100644
--- a/src/m/orion.h
+++ b/src/m/orion.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/orion105.h b/src/m/orion105.h
index 66f87748099..586ddf2ea35 100644
--- a/src/m/orion105.h
+++ b/src/m/orion105.h
@@ -1,6 +1,6 @@
 /* machine description file for HLH Orion 1/05 (Clipper).
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
    Lee McLoughlin <lmjm%doc.imperial.ac.uk@nss.cs.ucl.ac.uk>
 
 This file is part of GNU Emacs.
diff --git a/src/m/pfa50.h b/src/m/pfa50.h
index 0b1511fd8e7..3c13aa77872 100644
--- a/src/m/pfa50.h
+++ b/src/m/pfa50.h
@@ -1,6 +1,6 @@
 /* Machine description file for PFU A-series.
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/plexus.h b/src/m/plexus.h
index 8b3e9be7849..606caeb20f4 100644
--- a/src/m/plexus.h
+++ b/src/m/plexus.h
@@ -1,6 +1,6 @@
 /* machine description file for the Plexus running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/powermac.h b/src/m/powermac.h
index 232e424da35..419edb21b9f 100644
--- a/src/m/powermac.h
+++ b/src/m/powermac.h
@@ -1,5 +1,5 @@
 /* Machine description file for Apple Power Macintosh
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/powerpcle.h b/src/m/powerpcle.h
index b4681db06bd..fb70cbfcb4f 100644
--- a/src/m/powerpcle.h
+++ b/src/m/powerpcle.h
@@ -1,6 +1,6 @@
 /* machine description file for PowerPC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/pyramid.h b/src/m/pyramid.h
index 2dbd713f881..9a07ff09f1d 100644
--- a/src/m/pyramid.h
+++ b/src/m/pyramid.h
@@ -1,6 +1,6 @@
 /* machine description file for pyramid.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sequent-ptx.h b/src/m/sequent-ptx.h
index dbb0944a330..03a0bff3e12 100644
--- a/src/m/sequent-ptx.h
+++ b/src/m/sequent-ptx.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT machines running DYNIX/ptx
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sequent.h b/src/m/sequent.h
index e970275901c..d0051642826 100644
--- a/src/m/sequent.h
+++ b/src/m/sequent.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT BALANCE machines
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sh3el.h b/src/m/sh3el.h
index 0854ecd1b25..9c510979bdc 100644
--- a/src/m/sh3el.h
+++ b/src/m/sh3el.h
@@ -1,5 +1,5 @@
 /* machine description file for sh3el
-   Copyright (C) 1985, 1986 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sparc.h b/src/m/sparc.h
index c9ef035653b..3efb4c05553 100644
--- a/src/m/sparc.h
+++ b/src/m/sparc.h
@@ -1,6 +1,6 @@
 /* machine description file for Sun 4 SPARC.
-   Copyright (C) 1987, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sps7.h b/src/m/sps7.h
index 52edc570f92..db6c9d3a91e 100644
--- a/src/m/sps7.h
+++ b/src/m/sps7.h
@@ -1,6 +1,6 @@
 /* machine description file for Bull SPS-7.
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sr2k.h b/src/m/sr2k.h
deleted file mode 100644
index 14a90c666f4..00000000000
--- a/src/m/sr2k.h
+++ /dev/null
@@ -1,160 +0,0 @@
-/* machine description file for Hitachi SR2001/SR2201 machines.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
-
-This file is part of GNU Emacs.
-
-GNU Emacs is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU Emacs is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-Boston, MA 02110-1301, USA.  */
-
-
-/* The following line tells the configuration script what sort of
-   operating system this machine is likely to run.
-   USUAL-OPSYS="hpux"  */
-
-/* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
-   is the most significant byte.  */
-
-#define WORDS_BIG_ENDIAN
-
-/* Define NO_ARG_ARRAY if you cannot take the address of the first of a
- * group of arguments and treat it as an array of the arguments.  */
-
-#define NO_ARG_ARRAY
-
-/* Define WORD_MACHINE if addresses and such have
- * to be corrected before they can be used as byte counts.  */
-
-#undef WORD_MACHINE
-
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-#ifndef hp9000s800
-#	define hp9000s800
-#endif
-
-/* Use type int rather than a union, to represent Lisp_Object */
-/* This is desirable for most machines.  */
-
-#define NO_UNION_TYPE
-
-/* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the bit field into an int.  In other words, if bit fields
-   are always unsigned.
-
-   If you use NO_UNION_TYPE, this flag does not matter.  */
-
-#define EXPLICIT_SIGN_EXTEND
-
-/* The standard definitions of these macros would work ok,
-   but these are faster because the constants are short. */
-
-
-#define XUINT(a) (((unsigned)(a) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS)
-
-#define XSET(var, type, ptr) \
-   ((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
-
-/* #ifdef __hpux */
-/* Now define a symbol for the cpu type, if your compiler
-   does not define it automatically:
-   Ones defined so far include vax, m68000, ns16000, pyramid,
-   orion, tahoe, APOLLO and many others */
-
-#ifndef hp9000s800
-#     define hp9000s800
-#endif
-
-
-/* Data type of load average, as read out of kmem.  */
-
-#define LOAD_AVE_TYPE double
-
-/* Convert that into an integer that is 100 for a load average of 1.0  */
-
-#define LOAD_AVE_CVT(x) ((int) (x * 100.0))
-
-
-/* Define CANNOT_DUMP on machines where unexec does not work.
-   Then the function dump-emacs will not be defined
-   and temacs will do (load "loadup") automatically unless told otherwise.  */
-
-#undef CANNOT_DUMP
-
-/* Define VIRT_ADDR_VARIES if the virtual addresses of
-   pure and impure space as loaded can vary, and even their
-   relative order cannot be relied on.
-
-   Otherwise Emacs assumes that text space precedes data space,
-   numerically.  */
-
-#define VIRT_ADDR_VARIES
-
-/* the data segment on this machine always starts at address 0x40000000. */
-
-#define DATA_SEG_BITS 0x40000000
-
-#define DATA_START    0x40000000
-#define TEXT_START    0x00000000
-
-/* Define NO_REMAP if memory segmentation makes it not work well
-   to change the boundary between the text section and data section
-   when Emacs is dumped.  If you define this, the preloaded Lisp
-   code will not be sharable; but that's better than failing completely.  */
-
-#define NO_REMAP
-
-/* This machine requires completely different unexec code
-   which lives in a separate file.  Specify the file name.  */
-
-#define UNEXEC unexhp9k800.o
-
-#define LIBS_MACHINE
-#define LIBS_DEBUG
-
-/* Include the file bsdtty.h, since this machine has job control.  */
-/* #define NEED_BSDTTY */
-
-/* The symbol in the kernel where the load average is found
-   is named _avenrun.  At this time there are two major flavors
-   of hp-ux (there is the s800 and s300 (s200) flavors).  The
-   differences are thusly moved to the corresponding machine description file.
-*/
-
-/* no underscore please */
-#define LDAV_SYMBOL "avenrun"
-
-#if 0   /* Supposedly no longer true.  */
-/* In hpux, for unknown reasons, S_IFLNK is defined even though
-   symbolic links do not exist.
-   Make sure our conditionals based on S_IFLNK are not confused.
-
-   Here we assume that stat.h is included before config.h
-   so that we can override it here.  */
-
-#undef S_IFLNK
-#endif
-
-/* On USG systems these have different names. */
-
-#define index strchr
-#define rindex strrchr
-
-/* #endif */
-
-/* arch-tag: 4ced5b51-ffe6-4be1-9954-eb40657023a5
-   (do not change this comment) */
diff --git a/src/m/stride.h b/src/m/stride.h
index 6f05b17d96e..8acc84e3cbe 100644
--- a/src/m/stride.h
+++ b/src/m/stride.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Stride Micro System-V.2.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun1.h b/src/m/sun1.h
index 5ded70a9e47..526056dd80f 100644
--- a/src/m/sun1.h
+++ b/src/m/sun1.h
@@ -1,6 +1,6 @@
 /* machine description file for Sun 68000's
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun2.h b/src/m/sun2.h
index 1afa4a2fa63..cee54da79b7 100644
--- a/src/m/sun2.h
+++ b/src/m/sun2.h
@@ -1,8 +1,8 @@
 /* machine description file for Sun 68000's OPERATING SYSTEM version 2.
   Note that "sun2.h" refers to the operating system version, not the
   CPU model number.  See the MACHINES file for details.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/sun386.h b/src/m/sun386.h
index 435c1ded6d2..21a07a69423 100644
--- a/src/m/sun386.h
+++ b/src/m/sun386.h
@@ -2,8 +2,8 @@
    "sun2.h", but since that file is heavily cpu-specific, it was easier
    not to include it.
 
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/symmetry.h b/src/m/symmetry.h
index 91209d0eb67..39dde99f13c 100644
--- a/src/m/symmetry.h
+++ b/src/m/symmetry.h
@@ -1,6 +1,6 @@
 /* machine description file for SEQUENT SYMMETRY machines
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index fce223da826..357bbe80982 100644
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,6 +1,6 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tahoe.h b/src/m/tahoe.h
index 07ec23c7bb6..c28018a149d 100644
--- a/src/m/tahoe.h
+++ b/src/m/tahoe.h
@@ -1,6 +1,6 @@
 /* machine description file for tahoe.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/targon31.h b/src/m/targon31.h
index 7100e0e8705..34e3ae40c9e 100644
--- a/src/m/targon31.h
+++ b/src/m/targon31.h
@@ -1,6 +1,6 @@
 /* targon31 machine description file
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tek4300.h b/src/m/tek4300.h
index 3ff3ca4a6a0..30e40a0e09f 100644
--- a/src/m/tek4300.h
+++ b/src/m/tek4300.h
@@ -1,6 +1,6 @@
 /* machine description file for tek4300.
-   Copyright (C) 1988, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tekxd88.h b/src/m/tekxd88.h
index 24c10330363..3b858310af3 100644
--- a/src/m/tekxd88.h
+++ b/src/m/tekxd88.h
@@ -1,8 +1,8 @@
 /* Configuration file for the Tektronix XD88 running UTekV 3.2e,
    contributed by Kaveh Ghazi  (ghazi@caip.rutgers.edu)  1/15/93.
    You probably need to use gnu make (version 3.63 or higher.)
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/template.h b/src/m/template.h
index 2b39964018a..79d2d40ab70 100644
--- a/src/m/template.h
+++ b/src/m/template.h
@@ -1,6 +1,6 @@
 /* machine description file template.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32.h b/src/m/tower32.h
index 06ed7efe5d7..cdb6884d5fc 100644
--- a/src/m/tower32.h
+++ b/src/m/tower32.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.2.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index 8f5c60cd7c8..19e7d3ba7ea 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -1,6 +1,6 @@
 /* machine description file for the NCR Tower 32 running System V.3.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/ustation.h b/src/m/ustation.h
index 0a70df92233..b662cca208e 100644
--- a/src/m/ustation.h
+++ b/src/m/ustation.h
@@ -1,6 +1,6 @@
 /* machine description file for U-station (Nihon Unisys, SS5E; Sumitomo Denkoh, U-Station E30).
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/vax.h b/src/m/vax.h
index 9332b8f494d..fae30d37f73 100644
--- a/src/m/vax.h
+++ b/src/m/vax.h
@@ -1,6 +1,6 @@
 /* machine description file for vax.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/wicat.h b/src/m/wicat.h
index 24bb2acd210..6ab0a498104 100644
--- a/src/m/wicat.h
+++ b/src/m/wicat.h
@@ -1,6 +1,6 @@
 /* machine description file for WICAT machines.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/windowsnt.h b/src/m/windowsnt.h
index 4351f14144f..223958375ca 100644
--- a/src/m/windowsnt.h
+++ b/src/m/windowsnt.h
@@ -1,7 +1,7 @@
 /* Machine description file for Windows NT.
 
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/m/xps100.h b/src/m/xps100.h
index a9ac9bc5e36..89300211eec 100644
--- a/src/m/xps100.h
+++ b/src/m/xps100.h
@@ -1,8 +1,8 @@
 /* xps100.h for the Honeywell XPS100 running UNIX System V.2
    Mark J. Hewitt (mjh@uk.co.kernel)
 
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/mac.c b/src/mac.c
index d834bfb8de4..5084a02b27d 100644
--- a/src/mac.c
+++ b/src/mac.c
@@ -1,6 +1,6 @@
 /* Unix emulation routines for GNU Emacs on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macfns.c b/src/macfns.c
index c74fd1089f0..c43a43dae62 100644
--- a/src/macfns.c
+++ b/src/macfns.c
@@ -1,6 +1,6 @@
 /* Graphical user interface functions for Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macgui.h b/src/macgui.h
index 7eed001a4db..1348fe479cb 100644
--- a/src/macgui.h
+++ b/src/macgui.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macmenu.c b/src/macmenu.c
index a70a80d32ed..3ea09412650 100644
--- a/src/macmenu.c
+++ b/src/macmenu.c
@@ -1,6 +1,6 @@
 /* Menu support for GNU Emacs on Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -77,10 +77,11 @@ static const int min_menu_id[] = {0, 1, 234, 235, 236, 256, 16384, 32768};
 
 #define DIALOG_WINDOW_RESOURCE 130
 
+#if TARGET_API_MAC_CARBON
 #define HAVE_DIALOGS 1
+#endif
 
 #undef HAVE_MULTILINGUAL_MENU
-#undef HAVE_DIALOGS /* TODO: Implement native dialogs.  */
 
 /******************************************************************/
 /* Definitions copied from lwlib.h */
@@ -2319,8 +2320,390 @@ mac_menu_show (f, x, y, for_click, keymaps, title, error)
 
 
 #ifdef HAVE_DIALOGS
-/* Construct native Mac OS menubar based on widget_value tree.  */
+/* Construct native Mac OS dialog based on widget_value tree.  */
+
+#if TARGET_API_MAC_CARBON
+
+static pascal OSStatus
+mac_handle_dialog_event (next_handler, event, data)
+     EventHandlerCallRef next_handler;
+     EventRef event;
+     void *data;
+{
+  OSStatus err;
+  WindowRef window = (WindowRef) data;
+
+  switch (GetEventClass (event))
+    {
+    case kEventClassCommand:
+      {
+	HICommand command;
+
+	err = GetEventParameter (event, kEventParamDirectObject,
+				 typeHICommand, NULL, sizeof (HICommand),
+				 NULL, &command);
+	if (err == noErr)
+	  if ((command.commandID & ~0xffff) == 'Bt\0\0')
+	    {
+	      SetWRefCon (window, command.commandID);
+	      err = QuitAppModalLoopForWindow (window);
+
+	      return err == noErr ? noErr : eventNotHandledErr;
+	    }
+
+	return CallNextEventHandler (next_handler, event);
+      }
+      break;
+
+    case kEventClassKeyboard:
+      {
+	OSStatus result;
+	char char_code;
+
+	result = CallNextEventHandler (next_handler, event);
+	if (result == noErr)
+	  return noErr;
+
+	err = GetEventParameter (event, kEventParamKeyMacCharCodes,
+				 typeChar, NULL, sizeof (char),
+				 NULL, &char_code);
+	if (err == noErr)
+	  switch (char_code)
+	    {
+	    case kEscapeCharCode:
+	      err = QuitAppModalLoopForWindow (window);
+	      break;
+
+	    default:
+	      {
+		UInt32 modifiers, key_code;
+
+		err = GetEventParameter (event, kEventParamKeyModifiers,
+					 typeUInt32, NULL, sizeof (UInt32),
+					 NULL, &modifiers);
+		if (err == noErr)
+		  err = GetEventParameter (event, kEventParamKeyCode,
+					   typeUInt32, NULL, sizeof (UInt32),
+					   NULL, &key_code);
+		if (err == noErr)
+		  if (mac_quit_char_key_p (modifiers, key_code))
+		    err = QuitAppModalLoopForWindow (window);
+		  else
+		    err = eventNotHandledErr;
+	      }
+	      break;
+	    }
+
+	return err == noErr ? noErr : result;
+      }
+      break;
+
+    default:
+      abort ();
+    }
+}
+
+static OSStatus
+install_dialog_event_handler (window)
+     WindowRef window;
+{
+  static const EventTypeSpec specs[] =
+    {{kEventClassCommand, kEventCommandProcess},
+     {kEventClassKeyboard, kEventRawKeyDown}};
+  static EventHandlerUPP handle_dialog_eventUPP = NULL;
+
+  if (handle_dialog_eventUPP == NULL)
+    handle_dialog_eventUPP = NewEventHandlerUPP (mac_handle_dialog_event);
+  return InstallWindowEventHandler (window, handle_dialog_eventUPP,
+				    GetEventTypeCount (specs), specs,
+				    window, NULL);
+}
+
+#define DIALOG_LEFT_MARGIN (112)
+#define DIALOG_TOP_MARGIN (24)
+#define DIALOG_RIGHT_MARGIN (24)
+#define DIALOG_BOTTOM_MARGIN (20)
+#define DIALOG_MIN_INNER_WIDTH (338)
+#define DIALOG_MAX_INNER_WIDTH (564)
+#define DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE (12)
+#define DIALOG_BUTTON_BUTTON_VERTICAL_SPACE (12)
+#define DIALOG_BUTTON_MIN_WIDTH (68)
+#define DIALOG_TEXT_MIN_HEIGHT (50)
+#define DIALOG_TEXT_BUTTONS_VERTICAL_SPACE (10)
+#define DIALOG_ICON_WIDTH (64)
+#define DIALOG_ICON_HEIGHT (64)
+#define DIALOG_ICON_LEFT_MARGIN (24)
+#define DIALOG_ICON_TOP_MARGIN (15)
+
+static int
+create_and_show_dialog (f, first_wv)
+     FRAME_PTR f;
+     widget_value *first_wv;
+{
+  OSStatus err;
+  char *dialog_name, *message;
+  int nb_buttons, first_group_count, i, result = 0;
+  widget_value *wv;
+  short buttons_height, text_height, inner_width, inner_height;
+  Rect empty_rect, *rects;
+  WindowRef window = NULL;
+  ControlRef *buttons, default_button = NULL, text;
+
+  dialog_name = first_wv->name;
+  nb_buttons = dialog_name[1] - '0';
+  first_group_count = nb_buttons - (dialog_name[4] - '0');
+
+  wv = first_wv->contents;
+  message = wv->value;
+
+  wv = wv->next;
+  SetRect (&empty_rect, 0, 0, 0, 0);
+
+  /* Create dialog window.  */
+  err = CreateNewWindow (kMovableModalWindowClass,
+			 kWindowStandardHandlerAttribute,
+			 &empty_rect, &window);
+  if (err == noErr)
+    err = SetThemeWindowBackground (window, kThemeBrushMovableModalBackground,
+				    true);
+  if (err == noErr)
+    err = SetWindowTitleWithCFString (window, (dialog_name[0] == 'Q'
+					       ? CFSTR ("Question")
+					       : CFSTR ("Information")));
+
+  /* Create button controls and measure their optimal bounds.  */
+  if (err == noErr)
+    {
+      buttons = alloca (sizeof (ControlRef) * nb_buttons);
+      rects = alloca (sizeof (Rect) * nb_buttons);
+      for (i = 0; i < nb_buttons; i++)
+	{
+	  CFStringRef label = cfstring_create_with_utf8_cstring (wv->value);
+
+	  if (label == NULL)
+	    err = memFullErr;
+	  else
+	    {
+	      err = CreatePushButtonControl (window, &empty_rect,
+					     label, &buttons[i]);
+	      CFRelease (label);
+	    }
+	  if (err == noErr)
+	    {
+	      if (!wv->enabled)
+		{
+#ifdef MAC_OSX
+		  err = DisableControl (buttons[i]);
+#else
+		  err = DeactivateControl (buttons[i]);
+#endif
+		}
+	      else if (default_button == NULL)
+		default_button = buttons[i];
+	    }
+	  if (err == noErr)
+	    {
+	      SInt16 unused;
+
+	      rects[i] = empty_rect;
+	      err = GetBestControlRect (buttons[i], &rects[i], &unused);
+	    }
+	  if (err == noErr)
+	    {
+	      OffsetRect (&rects[i], -rects[i].left, -rects[i].top);
+	      if (rects[i].right < DIALOG_BUTTON_MIN_WIDTH)
+		rects[i].right = DIALOG_BUTTON_MIN_WIDTH;
+	      else if (rects[i].right > DIALOG_MAX_INNER_WIDTH)
+		rects[i].right = DIALOG_MAX_INNER_WIDTH;
+
+	      err = SetControlCommandID (buttons[i],
+					 'Bt\0\0' + (int) wv->call_data);
+	    }
+	  if (err != noErr)
+	    break;
+	  wv = wv->next;
+	}
+    }
+
+  /* Layout buttons.  rects[i] is set relative to the bottom-right
+     corner of the inner box.  */
+  if (err == noErr)
+    {
+      short bottom, right, max_height, left_align_shift;
+
+      inner_width = DIALOG_MIN_INNER_WIDTH;
+      bottom = right = max_height = 0;
+      for (i = 0; i < nb_buttons; i++)
+	{
+	  if (right - rects[i].right < - inner_width)
+	    {
+	      if (i != first_group_count
+		  && right - rects[i].right >= - DIALOG_MAX_INNER_WIDTH)
+		inner_width = - (right - rects[i].right);
+	      else
+		{
+		  bottom -= max_height + DIALOG_BUTTON_BUTTON_VERTICAL_SPACE;
+		  right = max_height = 0;
+		}
+	    }
+	  if (max_height < rects[i].bottom)
+	    max_height = rects[i].bottom;
+	  OffsetRect (&rects[i], right - rects[i].right,
+		      bottom - rects[i].bottom);
+	  right = rects[i].left - DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE;
+	  if (i == first_group_count - 1)
+	    right -= DIALOG_BUTTON_BUTTON_HORIZONTAL_SPACE;
+	}
+      buttons_height = - (bottom - max_height);
+
+      left_align_shift = - (inner_width + rects[nb_buttons - 1].left);
+      for (i = nb_buttons - 1; i >= first_group_count; i--)
+	{
+	  if (bottom != rects[i].bottom)
+	    {
+	      left_align_shift = - (inner_width + rects[i].left);
+	      bottom = rects[i].bottom;
+	    }
+	  OffsetRect (&rects[i], left_align_shift, 0);
+	}
+    }
+
+  /* Create a static text control and measure its bounds.  */
+  if (err == noErr)
+    {
+      CFStringRef message_string;
+      Rect bounds;
+
+      message_string = cfstring_create_with_utf8_cstring (message);
+      if (message_string == NULL)
+	err = memFullErr;
+      else
+	{
+	  ControlFontStyleRec text_style;
+
+	  text_style.flags = 0;
+	  SetRect (&bounds, 0, 0, inner_width, 0);
+	  err = CreateStaticTextControl (window, &bounds, message_string,
+					 &text_style, &text);
+	  CFRelease (message_string);
+	}
+      if (err == noErr)
+	{
+	  SInt16 unused;
+
+	  bounds = empty_rect;
+	  err = GetBestControlRect (text, &bounds, &unused);
+	}
+      if (err == noErr)
+	{
+	  text_height = bounds.bottom - bounds.top;
+	  if (text_height < DIALOG_TEXT_MIN_HEIGHT)
+	    text_height = DIALOG_TEXT_MIN_HEIGHT;
+	}
+    }
+
+  /* Place buttons. */
+  if (err == noErr)
+    {
+      inner_height = (text_height + DIALOG_TEXT_BUTTONS_VERTICAL_SPACE
+		      + buttons_height);
+
+      for (i = 0; i < nb_buttons; i++)
+	{
+	  OffsetRect (&rects[i], DIALOG_LEFT_MARGIN + inner_width,
+		      DIALOG_TOP_MARGIN + inner_height);
+	  SetControlBounds (buttons[i], &rects[i]);
+	}
+    }
 
+  /* Place text.  */
+  if (err == noErr)
+    {
+      Rect bounds;
+
+      SetRect (&bounds, DIALOG_LEFT_MARGIN, DIALOG_TOP_MARGIN,
+	       DIALOG_LEFT_MARGIN + inner_width,
+	       DIALOG_TOP_MARGIN + text_height);
+      SetControlBounds (text, &bounds);
+    }
+
+  /* Create the application icon at the upper-left corner.  */
+  if (err == noErr)
+    {
+      ControlButtonContentInfo content;
+      ControlRef icon;
+      static const ProcessSerialNumber psn = {0, kCurrentProcess};
+#ifdef MAC_OSX
+      FSRef app_location;
+#else
+      ProcessInfoRec pinfo;
+      FSSpec app_spec;
+#endif
+      SInt16 unused;
+
+      content.contentType = kControlContentIconRef;
+#ifdef MAC_OSX
+      err = GetProcessBundleLocation (&psn, &app_location);
+      if (err == noErr)
+	err = GetIconRefFromFileInfo (&app_location, 0, NULL, 0, NULL,
+				      kIconServicesNormalUsageFlag,
+				      &content.u.iconRef, &unused);
+#else
+      bzero (&pinfo, sizeof (ProcessInfoRec));
+      pinfo.processInfoLength = sizeof (ProcessInfoRec);
+      pinfo.processAppSpec = &app_spec;
+      err = GetProcessInformation (&psn, &pinfo);
+      if (err == noErr)
+	err = GetIconRefFromFile (&app_spec, &content.u.iconRef, &unused);
+#endif
+      if (err == noErr)
+	{
+	  Rect bounds;
+
+	  SetRect (&bounds, DIALOG_ICON_LEFT_MARGIN, DIALOG_ICON_TOP_MARGIN,
+		   DIALOG_ICON_LEFT_MARGIN + DIALOG_ICON_WIDTH,
+		   DIALOG_ICON_TOP_MARGIN + DIALOG_ICON_HEIGHT);
+	  err = CreateIconControl (window, &bounds, &content, true, &icon);
+	  ReleaseIconRef (content.u.iconRef);
+	}
+    }
+
+  /* Show the dialog window and run event loop.  */
+  if (err == noErr)
+    if (default_button)
+      err = SetWindowDefaultButton (window, default_button);
+  if (err == noErr)
+    err = install_dialog_event_handler (window);
+  if (err == noErr)
+    {
+      SizeWindow (window,
+		  DIALOG_LEFT_MARGIN + inner_width + DIALOG_RIGHT_MARGIN,
+		  DIALOG_TOP_MARGIN + inner_height + DIALOG_BOTTOM_MARGIN,
+		  true);
+      err = RepositionWindow (window, FRAME_MAC_WINDOW (f),
+			      kWindowAlertPositionOnParentWindow);
+    }
+  if (err == noErr)
+    {
+      SetWRefCon (window, 0);
+      ShowWindow (window);
+      BringToFront (window);
+      err = RunAppModalLoopForWindow (window);
+    }
+  if (err == noErr)
+    {
+      UInt32 command_id = GetWRefCon (window);
+
+      if ((command_id & ~0xffff) == 'Bt\0\0')
+	result = command_id - 'Bt\0\0';
+    }
+
+  if (window)
+    DisposeWindow (window);
+
+  return result;
+}
+#else  /* not TARGET_API_MAC_CARBON */
 static int
 mac_dialog (widget_value *wv)
 {
@@ -2425,6 +2808,7 @@ mac_dialog (widget_value *wv)
 
   return i;
 }
+#endif  /* not TARGET_API_MAC_CARBON */
 
 static char * button_names [] = {
   "button1", "button2", "button3", "button4", "button5",
@@ -2557,10 +2941,10 @@ mac_dialog_show (f, keymaps, title, header, error_name)
   }
 
   /* Actually create the dialog.  */
-#ifdef HAVE_DIALOGS
-  menu_item_selection = mac_dialog (first_wv);
+#if TARGET_API_MAC_CARBON
+  menu_item_selection = create_and_show_dialog (f, first_wv);
 #else
-  menu_item_selection = 0;
+  menu_item_selection = mac_dialog (first_wv);
 #endif
 
   /* Free the widget_value objects we used to specify the contents.  */
diff --git a/src/macros.c b/src/macros.c
index fb452e4e318..40fb429d41d 100644
--- a/src/macros.c
+++ b/src/macros.c
@@ -1,6 +1,6 @@
 /* Keyboard macros.
    Copyright (C) 1985, 1986, 1993, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macros.h b/src/macros.h
index bdd510456b0..2fb01667918 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -1,6 +1,6 @@
 /* Definitions for keyboard macro interpretation in GNU Emacs.
-   Copyright (C) 1985, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/macselect.c b/src/macselect.c
index 8d15db24144..8e86c7651e2 100644
--- a/src/macselect.c
+++ b/src/macselect.c
@@ -1,5 +1,5 @@
 /* Selection processing for Emacs on Mac OS.
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1390,7 +1390,7 @@ nil, which means the event is already resumed or expired.  */)
       ae = *p;
       *p = (*p)->next;
       if (INTEGERP (error_code)
-	  && ae->apple_event.descriptorType != typeNull)
+	  && ae->reply.descriptorType != typeNull)
 	{
 	  SInt32 errn = XINT (error_code);
 
@@ -1562,10 +1562,17 @@ mac_do_receive_drag (window, refcon, drag)
       GlobalToLocal (&mouse_pos);
       err = GetDragModifiers (drag, NULL, NULL, &modifiers);
     }
+  if (err == noErr)
+    {
+      UInt32 key_modifiers = modifiers;
+
+      err = AEPutParamPtr (&apple_event, kEventParamKeyModifiers,
+			   typeUInt32, &key_modifiers, sizeof (UInt32));
+    }
 
   if (err == noErr)
     {
-      mac_store_drag_event (window, mouse_pos, modifiers, &apple_event);
+      mac_store_drag_event (window, mouse_pos, 0, &apple_event);
       AEDisposeDesc (&apple_event);
       mac_wakeup_from_rne ();
       return noErr;
diff --git a/src/macterm.c b/src/macterm.c
index 1706da48cc3..8ba62f2308f 100644
--- a/src/macterm.c
+++ b/src/macterm.c
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -6572,6 +6572,9 @@ x_free_frame_resources (f)
   if (wp != tip_window)
     remove_window_handler (wp);
 
+#if USE_CG_DRAWING
+  mac_prepare_for_quickdraw (f);
+#endif
   DisposeWindow (wp);
   if (wp == tip_window)
     /* Neither WaitNextEvent nor ReceiveNextEvent receives `window
@@ -9052,6 +9055,38 @@ mac_get_emulated_btn ( UInt32 modifiers )
   return result;
 }
 
+#if TARGET_API_MAC_CARBON
+/***** Code to handle C-g testing  *****/
+extern int quit_char;
+extern int make_ctrl_char P_ ((int));
+
+int
+mac_quit_char_key_p (modifiers, key_code)
+     UInt32 modifiers, key_code;
+{
+  UInt32 char_code;
+  unsigned long some_state = 0;
+  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
+  int c, emacs_modifiers;
+
+  /* Mask off modifier keys that are mapped to some Emacs modifiers.  */
+  key_code |= (modifiers & ~(mac_mapped_modifiers (modifiers)));
+  char_code = KeyTranslate (kchr_ptr, key_code, &some_state);
+  if (char_code & ~0xff)
+    return 0;
+
+  emacs_modifiers = mac_to_emacs_modifiers (modifiers);
+  if (emacs_modifiers & ctrl_modifier)
+    c = make_ctrl_char (char_code);
+
+  c |= (emacs_modifiers
+	& (meta_modifier | alt_modifier
+	   | hyper_modifier | super_modifier));
+
+  return c == quit_char;
+}
+#endif
+
 #if USE_CARBON_EVENTS
 /* Obtains the event modifiers from the event ref and then calls
    mac_to_emacs_modifiers.  */
@@ -11607,35 +11642,6 @@ x_delete_display (dpyinfo)
 
 #ifdef MAC_OSX
 void
-mac_check_bundle()
-{
-  extern int inhibit_window_system;
-  extern int noninteractive;
-  CFBundleRef appsBundle;
-
-  /* No need to test if already -nw*/
-  if (inhibit_window_system || noninteractive)
-    return;
-
-  appsBundle = CFBundleGetMainBundle();
-  if (appsBundle != NULL)
-    {
-      CFStringRef cfBI = CFSTR("CFBundleIdentifier");
-      CFTypeRef res = CFBundleGetValueForInfoDictionaryKey(appsBundle, cfBI);
-      /* We found the bundle identifier, now we know we are valid. */
-      if (res != NULL)
-	{
-	  CFRelease(res);
-	  return;
-	}
-    }
-  /* MAC_TODO:  Have this start the bundled executable */
-
-  /* For now, prevent the fatal error by bringing it up in the terminal */
-  inhibit_window_system = 1;
-}
-
-void
 MakeMeTheFrontProcess ()
 {
   ProcessSerialNumber psn;
@@ -11645,36 +11651,6 @@ MakeMeTheFrontProcess ()
   if (err == noErr)
     (void) SetFrontProcess (&psn);
 }
-
-/***** Code to handle C-g testing  *****/
-extern int quit_char;
-extern int make_ctrl_char P_ ((int));
-
-int
-mac_quit_char_key_p (modifiers, key_code)
-     UInt32 modifiers, key_code;
-{
-  UInt32 char_code;
-  unsigned long some_state = 0;
-  Ptr kchr_ptr = (Ptr) GetScriptManagerVariable (smKCHRCache);
-  int c, emacs_modifiers;
-
-  /* Mask off modifier keys that are mapped to some Emacs modifiers.  */
-  key_code |= (modifiers & ~(mac_mapped_modifiers (modifiers)));
-  char_code = KeyTranslate (kchr_ptr, key_code, &some_state);
-  if (char_code & ~0xff)
-    return 0;
-
-  emacs_modifiers = mac_to_emacs_modifiers (modifiers);
-  if (emacs_modifiers & ctrl_modifier)
-    c = make_ctrl_char (char_code);
-
-  c |= (emacs_modifiers
-	& (meta_modifier | alt_modifier
-	   | hyper_modifier | super_modifier));
-
-  return c == quit_char;
-}
 #endif	/* MAC_OSX */
 
 static void
diff --git a/src/macterm.h b/src/macterm.h
index c7d86f157f1..0f474e1b3d8 100644
--- a/src/macterm.h
+++ b/src/macterm.h
@@ -1,6 +1,6 @@
 /* Display module for Mac OS.
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -522,8 +522,8 @@ struct scroll_bar {
 #define MAC_AQUA_SMALL_VERTICAL_SCROLL_BAR_WIDTH (11)
 
 /* Size of hourglass controls */
-#define HOURGLASS_WIDTH 16
-#define HOURGLASS_HEIGHT 16
+#define HOURGLASS_WIDTH (16)
+#define HOURGLASS_HEIGHT (16)
 
 /* Some constants that are used locally.  */
 /* Creator code for Emacs on Mac OS.  */
@@ -633,9 +633,7 @@ extern void do_apple_menu P_ ((SInt16));
 #if USE_CG_DRAWING
 extern void mac_prepare_for_quickdraw P_ ((struct frame *));
 #endif
-#ifdef MAC_OSX
 extern int mac_quit_char_key_p P_ ((UInt32, UInt32));
-#endif
 
 #define FONT_TYPE_FOR_UNIBYTE(font, ch) 0
 #define FONT_TYPE_FOR_MULTIBYTE(font, ch) 0
diff --git a/src/makefile.w32-in b/src/makefile.w32-in
index e8d30a31cc5..c796a52fe2c 100644
--- a/src/makefile.w32-in
+++ b/src/makefile.w32-in
@@ -1,6 +1,6 @@
 #  -*- Makefile -*- for GNU Emacs on the Microsoft W32 API.
 #  Copyright (C) 2000, 2001, 2002, 2003, 2004,
-#                2005, 2006 Free Software Foundation, Inc.
+#                2005, 2006, 2007 Free Software Foundation, Inc.
 #
 #  This file is part of GNU Emacs.
 #
diff --git a/src/marker.c b/src/marker.c
index 727e97900c2..31849782f6c 100644
--- a/src/marker.c
+++ b/src/marker.c
@@ -1,6 +1,6 @@
 /* Markers: examining, setting and deleting.
-   Copyright (C) 1985, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/md5.c b/src/md5.c
index 0daf2c3ef7c..4d8c6d890fe 100644
--- a/src/md5.c
+++ b/src/md5.c
@@ -1,7 +1,7 @@
 /* Functions to compute MD5 message digest of files or memory blocks.
    according to the definition of MD5 in RFC 1321 from April 1992.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    This file is part of the GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/md5.h b/src/md5.h
index 202b2749504..a23dbd089ba 100644
--- a/src/md5.h
+++ b/src/md5.h
@@ -1,7 +1,7 @@
 /* Declaration of functions and data types used for MD5 sum computing
    library functions.
-   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    This file is part of GNU Emacs.
 
    The GNU C Library is free software; you can redistribute it and/or
diff --git a/src/mem-limits.h b/src/mem-limits.h
index 45dabca3ac5..30d57d8b51c 100644
--- a/src/mem-limits.h
+++ b/src/mem-limits.h
@@ -1,6 +1,6 @@
 /* Includes for memory limit warnings.
-   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/minibuf.c b/src/minibuf.c
index 3778d185e97..bdd810cb201 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1,7 +1,7 @@
 /* Minibuffer input and completion.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
                  2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -1236,22 +1236,25 @@ minibuf_conform_representation (string, basis)
 }
 
 DEFUN ("try-completion", Ftry_completion, Stry_completion, 2, 3, 0,
-       doc: /* Return common substring of all completions of STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Return common substring of all completions of STRING in COLLECTION.
+Test each possible completion specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-All that match are compared together; the longest initial sequence
-common to all matches is returned as a string.
-If there is no match at all, nil is returned.
-For a unique match which is exact, t is returned.
-
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
-
-ALIST can also be a function to do the completion itself.
+All that match STRING are compared together; the longest initial sequence
+common to all these matches is the return value.
+If there is no match at all, the return value is nil.
+For a unique match which is exact, the return value is t.
+
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
+
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and nil.
 Whatever it returns becomes the value of `try-completion'.
 
@@ -1259,23 +1262,23 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.  */)
-     (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+     (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object bestmatch, tail, elt, eltstring;
   /* Size in bytes of BESTMATCH.  */
   int bestmatchsize = 0;
   /* These are in bytes, too.  */
   int compare, matchsize;
-  int type = (HASH_TABLE_P (alist) ? 3
-	      : VECTORP (alist) ? 2
-	      : NILP (alist) || (CONSP (alist)
-				 && (!SYMBOLP (XCAR (alist))
-				     || NILP (XCAR (alist)))));
+  int type = (HASH_TABLE_P (collection) ? 3
+	      : VECTORP (collection) ? 2
+	      : NILP (collection) || (CONSP (collection)
+				      && (!SYMBOLP (XCAR (collection))
+					  || NILP (XCAR (collection)))));
   int index = 0, obsize = 0;
   int matchcount = 0;
   int bindcount = -1;
@@ -1284,18 +1287,18 @@ is used to further constrain the set of candidates.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qnil);
+    return call3 (collection, string, predicate, Qnil);
 
   bestmatch = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      alist = check_obarray (alist);
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      collection = check_obarray (collection);
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1330,19 +1333,19 @@ is used to further constrain the set of candidates.  */)
 	    break;
 	  else
 	    {
-	      bucket = XVECTOR (alist)->contents[index];
+	      bucket = XVECTOR (collection)->contents[index];
 	      continue;
 	    }
 	}
       else /* if (type == 3) */
 	{
-	  while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-		 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+	  while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+		 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
 	    index++;
-	  if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+	  if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
 	    break;
 	  else
-	    elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+	    elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
 	}
 
       /* Is this element a possible completion? */
@@ -1395,7 +1398,7 @@ is used to further constrain the set of candidates.  */)
 		  GCPRO4 (tail, string, eltstring, bestmatch);
 		  tem = type == 3
 		    ? call2 (predicate, elt,
-			     HASH_VALUE (XHASH_TABLE (alist), index - 1))
+			     HASH_VALUE (XHASH_TABLE (collection), index - 1))
 		    : call1 (predicate, elt);
 		  UNGCPRO;
 		}
@@ -1504,19 +1507,22 @@ is used to further constrain the set of candidates.  */)
 }
 
 DEFUN ("all-completions", Fall_completions, Sall_completions, 2, 4, 0,
-       doc: /* Search for partial matches to STRING in ALIST.
-Each car of each element of ALIST (or each element if it is not a cons cell)
-is tested to see if it begins with STRING.  The possible matches may be
+       doc: /* Search for partial matches to STRING in COLLECTION.
+Test each of the possible completions specified by COLLECTION
+to see if it begins with STRING.  The possible completions may be
 strings or symbols.  Symbols are converted to strings before testing,
 see `symbol-name'.
-The value is a list of all the strings from ALIST that match.
+The value is a list of all the possible completions that match STRING.
 
-If ALIST is a hash-table, all the string and symbol keys are the
-possible matches.
-If ALIST is an obarray, the names of all symbols in the obarray
-are the possible matches.
+If COLLECTION is an alist, the keys (cars of elements) are the
+possible completions.  If an element is not a cons cell, then the
+element itself is the possible completion.
+If COLLECTION is a hash-table, all the keys that are strings or symbols
+are the possible completions.
+If COLLECTION is an obarray, the names of all symbols in the obarray
+are the possible completions.
 
-ALIST can also be a function to do the completion itself.
+COLLECTION can also be a function to do the completion itself.
 It receives three arguments: the values STRING, PREDICATE and t.
 Whatever it returns becomes the value of `all-completions'.
 
@@ -1524,24 +1530,24 @@ If optional third argument PREDICATE is non-nil,
 it is used to test each possible match.
 The match is a candidate only if PREDICATE returns non-nil.
 The argument given to PREDICATE is the alist element
-or the symbol from the obarray.  If ALIST is a hash-table,
+or the symbol from the obarray.  If COLLECTION is a hash-table,
 predicate is called with two arguments: the key and the value.
 Additionally to this predicate, `completion-regexp-list'
 is used to further constrain the set of candidates.
 
 If the optional fourth argument HIDE-SPACES is non-nil,
-strings in ALIST that start with a space
+strings in COLLECTION that start with a space
 are ignored unless STRING itself starts with a space.  */)
-     (string, alist, predicate, hide_spaces)
-     Lisp_Object string, alist, predicate, hide_spaces;
+     (string, collection, predicate, hide_spaces)
+     Lisp_Object string, collection, predicate, hide_spaces;
 {
   Lisp_Object tail, elt, eltstring;
   Lisp_Object allmatches;
-  int type = HASH_TABLE_P (alist) ? 3
-    : VECTORP (alist) ? 2
-    : NILP (alist) || (CONSP (alist)
-		       && (!SYMBOLP (XCAR (alist))
-			   || NILP (XCAR (alist))));
+  int type = HASH_TABLE_P (collection) ? 3
+    : VECTORP (collection) ? 2
+    : NILP (collection) || (CONSP (collection)
+			    && (!SYMBOLP (XCAR (collection))
+				|| NILP (XCAR (collection))));
   int index = 0, obsize = 0;
   int bindcount = -1;
   Lisp_Object bucket, tem, zero;
@@ -1549,16 +1555,16 @@ are ignored unless STRING itself starts with a space.  */)
 
   CHECK_STRING (string);
   if (type == 0)
-    return call3 (alist, string, predicate, Qt);
+    return call3 (collection, string, predicate, Qt);
   allmatches = bucket = Qnil;
   zero = make_number (0);
 
-  /* If ALIST is not a list, set TAIL just for gc pro.  */
-  tail = alist;
+  /* If COLLECTION is not a list, set TAIL just for gc pro.  */
+  tail = collection;
   if (type == 2)
     {
-      obsize = XVECTOR (alist)->size;
-      bucket = XVECTOR (alist)->contents[index];
+      obsize = XVECTOR (collection)->size;
+      bucket = XVECTOR (collection)->contents[index];
     }
 
   while (1)
@@ -1591,19 +1597,19 @@ are ignored unless STRING itself starts with a space.  */)
 	    break;
 	  else
 	    {
-	      bucket = XVECTOR (alist)->contents[index];
+	      bucket = XVECTOR (collection)->contents[index];
 	      continue;
 	    }
 	}
       else /* if (type == 3) */
 	{
-	  while (index < HASH_TABLE_SIZE (XHASH_TABLE (alist))
-		 && NILP (HASH_HASH (XHASH_TABLE (alist), index)))
+	  while (index < HASH_TABLE_SIZE (XHASH_TABLE (collection))
+		 && NILP (HASH_HASH (XHASH_TABLE (collection), index)))
 	    index++;
-	  if (index >= HASH_TABLE_SIZE (XHASH_TABLE (alist)))
+	  if (index >= HASH_TABLE_SIZE (XHASH_TABLE (collection)))
 	    break;
 	  else
-	    elt = eltstring = HASH_KEY (XHASH_TABLE (alist), index++);
+	    elt = eltstring = HASH_KEY (XHASH_TABLE (collection), index++);
 	}
 
       /* Is this element a possible completion? */
@@ -1665,7 +1671,7 @@ are ignored unless STRING itself starts with a space.  */)
 		  GCPRO4 (tail, eltstring, allmatches, string);
 		  tem = type == 3
 		    ? call2 (predicate, elt,
-			     HASH_VALUE (XHASH_TABLE (alist), index - 1))
+			     HASH_VALUE (XHASH_TABLE (collection), index - 1))
 		    : call1 (predicate, elt);
 		  UNGCPRO;
 		}
@@ -1692,14 +1698,14 @@ Lisp_Object Vminibuffer_completing_file_name;
 DEFUN ("completing-read", Fcompleting_read, Scompleting_read, 2, 8, 0,
        doc: /* Read a string in the minibuffer, with completion.
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
-TABLE can be a list of strings, an alist, an obarray or a hash table.
-TABLE can also be a function to do the completion itself.
-PREDICATE limits completion to a subset of TABLE.
+COLLECTION can be a list of strings, an alist, an obarray or a hash table.
+COLLECTION can also be a function to do the completion itself.
+PREDICATE limits completion to a subset of COLLECTION.
 See `try-completion' and `all-completions' for more details
- on completion, TABLE, and PREDICATE.
+ on completion, COLLECTION, and PREDICATE.
 
 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
- the input is (or completes to) an element of TABLE or is null.
+ the input is (or completes to) an element of COLLECTION or is null.
  If it is also not t, typing RET does not exit if it does non-null completion.
 If the input is null, `completing-read' returns DEF, or an empty string
  if DEF is nil, regardless of the value of REQUIRE-MATCH.
@@ -1733,8 +1739,8 @@ If INHERIT-INPUT-METHOD is non-nil, the minibuffer inherits
 
 Completion ignores case if the ambient value of
   `completion-ignore-case' is non-nil.  */)
-     (prompt, table, predicate, require_match, initial_input, hist, def, inherit_input_method)
-     Lisp_Object prompt, table, predicate, require_match, initial_input;
+     (prompt, collection, predicate, require_match, initial_input, hist, def, inherit_input_method)
+     Lisp_Object prompt, collection, predicate, require_match, initial_input;
      Lisp_Object hist, def, inherit_input_method;
 {
   Lisp_Object val, histvar, histpos, position;
@@ -1746,7 +1752,7 @@ Completion ignores case if the ambient value of
   init = initial_input;
   GCPRO1 (def);
 
-  specbind (Qminibuffer_completion_table, table);
+  specbind (Qminibuffer_completion_table, collection);
   specbind (Qminibuffer_completion_predicate, predicate);
   specbind (Qminibuffer_completion_confirm,
 	    EQ (require_match, Qt) ? Qnil : require_match);
@@ -1808,27 +1814,28 @@ Lisp_Object Fassoc_string ();
 DEFUN ("test-completion", Ftest_completion, Stest_completion, 2, 3, 0,
        doc: /* Return non-nil if STRING is a valid completion.
 Takes the same arguments as `all-completions' and `try-completion'.
-If ALIST is a function, it is called with three arguments:
+If COLLECTION is a function, it is called with three arguments:
 the values STRING, PREDICATE and `lambda'.  */)
-       (string, alist, predicate)
-     Lisp_Object string, alist, predicate;
+       (string, collection, predicate)
+     Lisp_Object string, collection, predicate;
 {
   Lisp_Object regexps, tail, tem = Qnil;
   int i = 0;
 
   CHECK_STRING (string);
 
-  if ((CONSP (alist) && (!SYMBOLP (XCAR (alist)) || NILP (XCAR (alist))))
-      || NILP (alist))
+  if ((CONSP (collection)
+       && (!SYMBOLP (XCAR (collection)) || NILP (XCAR (collection))))
+      || NILP (collection))
     {
-      tem = Fassoc_string (string, alist, completion_ignore_case ? Qt : Qnil);
+      tem = Fassoc_string (string, collection, completion_ignore_case ? Qt : Qnil);
       if (NILP (tem))
 	return Qnil;
     }
-  else if (VECTORP (alist))
+  else if (VECTORP (collection))
     {
       /* Bypass intern-soft as that loses for nil.  */
-      tem = oblookup (alist,
+      tem = oblookup (collection,
 		      SDATA (string),
 		      SCHARS (string),
 		      SBYTES (string));
@@ -1839,7 +1846,7 @@ the values STRING, PREDICATE and `lambda'.  */)
 	  else
 	    string = Fstring_make_multibyte (string);
 
-	  tem = oblookup (alist,
+	  tem = oblookup (collection,
 			  SDATA (string),
 			  SCHARS (string),
 			  SBYTES (string));
@@ -1847,9 +1854,9 @@ the values STRING, PREDICATE and `lambda'.  */)
 
       if (completion_ignore_case && !SYMBOLP (tem))
 	{
-	  for (i = XVECTOR (alist)->size - 1; i >= 0; i--)
+	  for (i = XVECTOR (collection)->size - 1; i >= 0; i--)
 	    {
-	      tail = XVECTOR (alist)->contents[i];
+	      tail = XVECTOR (collection)->contents[i];
 	      if (SYMBOLP (tail))
 		while (1)
 		  {
@@ -1871,9 +1878,9 @@ the values STRING, PREDICATE and `lambda'.  */)
       if (!SYMBOLP (tem))
 	return Qnil;
     }
-  else if (HASH_TABLE_P (alist))
+  else if (HASH_TABLE_P (collection))
     {
-      struct Lisp_Hash_Table *h = XHASH_TABLE (alist);
+      struct Lisp_Hash_Table *h = XHASH_TABLE (collection);
       i = hash_lookup (h, string, NULL);
       if (i >= 0)
 	tem = HASH_KEY (h, i);
@@ -1892,7 +1899,7 @@ the values STRING, PREDICATE and `lambda'.  */)
 	return Qnil;
     }
   else
-    return call3 (alist, string, predicate, Qlambda);
+    return call3 (collection, string, predicate, Qlambda);
 
   /* Reject this element if it fails to match all the regexps.  */
   if (CONSP (Vcompletion_regexp_list))
@@ -1913,8 +1920,8 @@ the values STRING, PREDICATE and `lambda'.  */)
   /* Finally, check the predicate.  */
   if (!NILP (predicate))
     {
-      return HASH_TABLE_P (alist)
-	? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (alist), i))
+      return HASH_TABLE_P (collection)
+	? call2 (predicate, tem, HASH_VALUE (XHASH_TABLE (collection), i))
 	: call1 (predicate, tem);
     }
   else
diff --git a/src/mktime.c b/src/mktime.c
index a85ebeb3783..20c1092a62a 100644
--- a/src/mktime.c
+++ b/src/mktime.c
@@ -1,6 +1,6 @@
 /* Convert a `struct tm' to a time_t value.
-   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
    Contributed by Paul Eggert (eggert@twinsun.com).
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
diff --git a/src/msdos.c b/src/msdos.c
index 6413fed0014..f9ce739fd5b 100644
--- a/src/msdos.c
+++ b/src/msdos.c
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities.          -*- coding: raw-text -*-
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/msdos.h b/src/msdos.h
index cbe65818867..7a6d2e64ca0 100644
--- a/src/msdos.h
+++ b/src/msdos.h
@@ -1,6 +1,6 @@
 /* MS-DOS specific C utilities, interface.
    Copyright (C) 1993, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/prefix-args.c b/src/prefix-args.c
index ad634585168..1fead09247d 100644
--- a/src/prefix-args.c
+++ b/src/prefix-args.c
@@ -1,6 +1,6 @@
 /* prefix-args.c - echo each argument, prefixed by a string.
-   Copyright (C) 1992, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/print.c b/src/print.c
index 5d650813458..883daa55e2b 100644
--- a/src/print.c
+++ b/src/print.c
@@ -1,7 +1,7 @@
 /* Lisp object printing and output streams.
    Copyright (C) 1985, 1986, 1988, 1993, 1994, 1995, 1997,
                  1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/process.c b/src/process.c
index f6dad808ffe..38a5c8341cf 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /* Asynchronous subprocess control for GNU Emacs.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1996, 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -815,9 +815,12 @@ nil, indicating the current buffer's process.  */)
     {
 #ifdef SIGCHLD
       Lisp_Object symbol;
+      /* Assignment to EMACS_INT stops GCC whining about limited range
+	 of data type.  */
+      EMACS_INT pid = p->pid;;
 
       /* No problem storing the pid here, as it is still in Vprocess_alist.  */
-      deleted_pid_list = Fcons (make_fixnum_or_float (p->pid),
+      deleted_pid_list = Fcons (make_fixnum_or_float (pid),
 				/* GC treated elements set to nil.  */
 				Fdelq (Qnil, deleted_pid_list));
       /* If the process has already signaled, remove it from the list.  */
@@ -827,7 +830,7 @@ nil, indicating the current buffer's process.  */)
       if (CONSP (p->status))
 	symbol = XCAR (p->status);
       if (EQ (symbol, Qsignal) || EQ (symbol, Qexit))
-	Fdelete (make_fixnum_or_float (p->pid), deleted_pid_list);
+	Fdelete (make_fixnum_or_float (pid), deleted_pid_list);
       else
 #endif
 	{
@@ -912,10 +915,13 @@ For a network connection, this value is nil.  */)
      (process)
      register Lisp_Object process;
 {
+  /* Assignment to EMACS_INT stops GCC whining about limited range of
+     data type.  */
+  EMACS_INT pid;
+
   CHECK_PROCESS (process);
-  return (XPROCESS (process)->pid
-	  ? make_fixnum_or_float (XPROCESS (process)->pid)
-	  : Qnil);
+  pid = XPROCESS (process)->pid;
+  return (pid ? make_fixnum_or_float (pid) : Qnil);
 }
 
 DEFUN ("process-name", Fprocess_name, Sprocess_name, 1, 1, 0,
@@ -6410,7 +6416,7 @@ sigchld_handler (signo)
 
   while (1)
     {
-      register int pid;
+      register EMACS_INT pid;
       WAITTYPE w;
       Lisp_Object tail;
 
diff --git a/src/process.h b/src/process.h
index fcf8d9b6c1f..718d2a70ea8 100644
--- a/src/process.h
+++ b/src/process.h
@@ -1,6 +1,6 @@
 /* Definitions for asynchronous process control in GNU Emacs.
-   Copyright (C) 1985, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/puresize.h b/src/puresize.h
index bd8d74f4df6..733d63e5ca6 100644
--- a/src/puresize.h
+++ b/src/puresize.h
@@ -1,6 +1,6 @@
 /* How much read-only Lisp storage a dumped Emacs needs.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/ralloc.c b/src/ralloc.c
index 83a26dd35d6..7b319556117 100644
--- a/src/ralloc.c
+++ b/src/ralloc.c
@@ -1,6 +1,6 @@
 /* Block-relocating memory allocator.
-   Copyright (C) 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/regex.c b/src/regex.c
index b1307743f0f..7784a3ae616 100644
--- a/src/regex.c
+++ b/src/regex.c
@@ -3,7 +3,7 @@
    internationalization features.)
 
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/regex.h b/src/regex.h
index 14817c35e90..dd57ba36f57 100644
--- a/src/regex.h
+++ b/src/regex.h
@@ -1,8 +1,9 @@
 /* Definitions for data structures and routines for the regular
    expression library, version 0.12.
 
-   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993, 1995, 2000, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
diff --git a/src/region-cache.c b/src/region-cache.c
index cedb0017da0..f30e00470f7 100644
--- a/src/region-cache.c
+++ b/src/region-cache.c
@@ -1,6 +1,6 @@
 /* Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1989, 1993, 1995, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/region-cache.h b/src/region-cache.h
index 40e68084cce..27176d80dbc 100644
--- a/src/region-cache.h
+++ b/src/region-cache.h
@@ -1,6 +1,6 @@
 /* Header file: Caching facts about regions of the buffer, for optimization.
-   Copyright (C) 1985, 1986, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index f77a209f0d2..204baa40f07 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on IBM AIX version 3.1
-   Copyright (C) 1985, 1986, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-1.h b/src/s/bsd4-1.h
index 3e6a44f1fab..2b11ba2302f 100644
--- a/src/s/bsd4-1.h
+++ b/src/s/bsd4-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.1.
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-2.h b/src/s/bsd4-2.h
index ace519c0d74..40c655bea87 100644
--- a/src/s/bsd4-2.h
+++ b/src/s/bsd4-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.2
-   Copyright (C) 1985, 1986, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/bsd4-3.h b/src/s/bsd4-3.h
index 483effe71c1..249cf34f41b 100644
--- a/src/s/bsd4-3.h
+++ b/src/s/bsd4-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on bsd 4.3
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cxux.h b/src/s/cxux.h
index 3c4ffcd24a2..daed2fc85d8 100644
--- a/src/s/cxux.h
+++ b/src/s/cxux.h
@@ -1,6 +1,6 @@
 /* Header file for Harris CXUX.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 749d1a38e3e..eff48e339cb 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
    Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/darwin.h b/src/s/darwin.h
index 91975cd441b..7175ea5457c 100644
--- a/src/s/darwin.h
+++ b/src/s/darwin.h
@@ -1,6 +1,6 @@
 /* System description header file for Darwin (Mac OS X).
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux.h b/src/s/dgux.h
index d48d95709c8..62194a2fc6e 100644
--- a/src/s/dgux.h
+++ b/src/s/dgux.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 4.32 upto and including 5.4.1.
-   Copyright (C) 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux4.h b/src/s/dgux4.h
index ee24cd65b50..01d75650e6f 100644
--- a/src/s/dgux4.h
+++ b/src/s/dgux4.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    Release 4.10 and above.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux5-4-3.h b/src/s/dgux5-4-3.h
index d0f6d4f43e8..c9f471af05a 100644
--- a/src/s/dgux5-4-3.h
+++ b/src/s/dgux5-4-3.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    version 5.4 Release 3.00 and above.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/dgux5-4r2.h b/src/s/dgux5-4r2.h
index be0ba73b4e0..fef2da7d29d 100644
--- a/src/s/dgux5-4r2.h
+++ b/src/s/dgux5-4r2.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on Data General's DG/UX
    5.4 Release 2.xx systems.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index 78f314700b3..3adca71bebc 100644
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -2,7 +2,7 @@
    This file describes the parameters that system description files
    should define or not.
    Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/gnu-linux.h b/src/s/gnu-linux.h
index 7116d24c718..24a37f964db 100644
--- a/src/s/gnu-linux.h
+++ b/src/s/gnu-linux.h
@@ -1,6 +1,6 @@
 /* This file is the configuration file for Linux-based GNU systems
-   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1994, 1996, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/gnu.h b/src/s/gnu.h
index 71f1dd34a5e..c4f1a798d9e 100644
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/hpux.h b/src/s/hpux.h
index b8f9c62a893..c0419fbad46 100644
--- a/src/s/hpux.h
+++ b/src/s/hpux.h
@@ -1,7 +1,7 @@
 /* Definitions file for GNU Emacs running on HPUX release 7.0.
    Based on AT&T System V.2.
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/iris3-5.h b/src/s/iris3-5.h
index 6b0009c1c38..abbd945ab2f 100644
--- a/src/s/iris3-5.h
+++ b/src/s/iris3-5.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics 3.5
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/iris3-6.h b/src/s/iris3-6.h
index d0c68bd89cb..192118eeca7 100644
--- a/src/s/iris3-6.h
+++ b/src/s/iris3-6.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics system 3.6.
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/irix3-3.h b/src/s/irix3-3.h
index a65242179a9..1512077fe49 100644
--- a/src/s/irix3-3.h
+++ b/src/s/irix3-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Silicon Graphics Irix system 3.3.
-   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/lynxos.h b/src/s/lynxos.h
index b822bad3691..faa036037f5 100644
--- a/src/s/lynxos.h
+++ b/src/s/lynxos.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on LynxOS-3.0.1
    Copyright (C) 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 06b1f8960f0..ad699dff035 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -1,6 +1,6 @@
 /* System description file for Windows NT.
-   Copyright (C) 1993, 1994, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/msdos.h b/src/s/msdos.h
index 966384ee352..0bb5a678ae3 100644
--- a/src/s/msdos.h
+++ b/src/s/msdos.h
@@ -1,7 +1,7 @@
 /* System description file for MS-DOS
 
    Copyright (C) 1993, 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/newsos5.h b/src/s/newsos5.h
index 0b441d74e24..b548a47ffbe 100644
--- a/src/s/newsos5.h
+++ b/src/s/newsos5.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sony's NEWS-OS 5.0.2
-   Copyright (C) 1992, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 8ea45e16e6e..2923712d929 100644
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -1,6 +1,6 @@
 /* Configuration file for the NeXTstep system.
-   Copyright (C) 1990, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/ptx.h b/src/s/ptx.h
index 319bbc049f2..edbbe5b2ac4 100644
--- a/src/s/ptx.h
+++ b/src/s/ptx.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on Sequent DYNIX/ptx 1.x/2.x
-   Copyright (C) 1987, 1990, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/riscix1-1.h b/src/s/riscix1-1.h
index d6281d256b6..682ba06720a 100644
--- a/src/s/riscix1-1.h
+++ b/src/s/riscix1-1.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.1 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/riscix12.h b/src/s/riscix12.h
index a4811877070..d082e442810 100644
--- a/src/s/riscix12.h
+++ b/src/s/riscix12.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RISCiX 1.2 (bsd 4.3)
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/rtu.h b/src/s/rtu.h
index 2a9df14a14c..1517165877b 100644
--- a/src/s/rtu.h
+++ b/src/s/rtu.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on RTU 3.0, ucb universe.
-   Copyright (C) 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco4.h b/src/s/sco4.h
index 0eda0a3f728..96e812ce0e4 100644
--- a/src/s/sco4.h
+++ b/src/s/sco4.h
@@ -1,6 +1,6 @@
 /* System description file for SCO 3.2v4.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/sco5.h b/src/s/sco5.h
index 06166f32fd9..6ab7b60e466 100644
--- a/src/s/sco5.h
+++ b/src/s/sco5.h
@@ -1,5 +1,6 @@
 /* System description file for SCO 3.2v5.
-   Copyright (C) 1996, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, 2006,
+                 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/template.h b/src/s/template.h
index 94b3787811f..c16b12971ad 100644
--- a/src/s/template.h
+++ b/src/s/template.h
@@ -1,8 +1,8 @@
 /* Template for system description header files.
    This file describes the parameters that system description files
    should define or not.
-   Copyright (C) 1985, 1986, 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/umax.h b/src/s/umax.h
index ae3b98cfcad..5d379ea398a 100644
--- a/src/s/umax.h
+++ b/src/s/umax.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UMAX 4.2
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/unipl5-2.h b/src/s/unipl5-2.h
index 096096f9f7a..0d4aba8ea2b 100644
--- a/src/s/unipl5-2.h
+++ b/src/s/unipl5-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on UniSoft's UniPlus 5.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-0.h b/src/s/usg5-0.h
index 94389290726..101e75726ef 100644
--- a/src/s/usg5-0.h
+++ b/src/s/usg5-0.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V.0
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-2-2.h b/src/s/usg5-2-2.h
index a60a985856d..b2c89a1abdc 100644
--- a/src/s/usg5-2-2.h
+++ b/src/s/usg5-2-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.2
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-2.h b/src/s/usg5-2.h
index 7f1fcb92ec5..13a9885fb53 100644
--- a/src/s/usg5-2.h
+++ b/src/s/usg5-2.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 2.0
-   Copyright (C) 1985, 1986, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-3.h b/src/s/usg5-3.h
index 56a448e9dba..0e0a1c84829 100644
--- a/src/s/usg5-3.h
+++ b/src/s/usg5-3.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 3
-   Copyright (C) 1987, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/usg5-4.h b/src/s/usg5-4.h
index 5e202e3edad..4ca5b6fcabc 100644
--- a/src/s/usg5-4.h
+++ b/src/s/usg5-4.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
-   Copyright (C) 1987, 1990, 1999, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/vms.h b/src/s/vms.h
index 51f3ca1a531..4d9bbaebb07 100644
--- a/src/s/vms.h
+++ b/src/s/vms.h
@@ -1,6 +1,6 @@
 /* system description header for VMS
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/s/xenix.h b/src/s/xenix.h
index 09a7b61fcd1..6d77ef50acc 100644
--- a/src/s/xenix.h
+++ b/src/s/xenix.h
@@ -1,6 +1,6 @@
 /* Definitions file for GNU Emacs running SCO Xenix 386 Release 2.2
-   Copyright (C) 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/scroll.c b/src/scroll.c
index 9b04f47c16b..964e7ba9037 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -1,6 +1,6 @@
 /* Calculate what line insertion or deletion to do, and do it,
-   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/search.c b/src/search.c
index 3fc3faeda98..abc28619199 100644
--- a/src/search.c
+++ b/src/search.c
@@ -1,6 +1,6 @@
 /* String search routines for GNU Emacs.
-   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1993, 1994, 1997, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sheap.c b/src/sheap.c
index 03da2afa813..510a75d4743 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -1,7 +1,7 @@
 /* simulate `sbrk' with an array in .bss, for `unexec' support for Cygwin;
    complete rewrite of xemacs Cygwin `unexec' code
 
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sound.c b/src/sound.c
index b6f5ff513ee..7fb79e64048 100644
--- a/src/sound.c
+++ b/src/sound.c
@@ -1,6 +1,6 @@
 /* sound.c -- sound support.
    Copyright (C) 1998, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/strftime.c b/src/strftime.c
index 88800c0d408..7a9506e55d3 100644
--- a/src/strftime.c
+++ b/src/strftime.c
@@ -1,5 +1,6 @@
 /* Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with gnulib.
    Bugs can be reported to bug-gnulib@gnu.org.
diff --git a/src/sunfns.c b/src/sunfns.c
index 336f02221cf..c532ae7f849 100644
--- a/src/sunfns.c
+++ b/src/sunfns.c
@@ -1,6 +1,6 @@
 /* Functions for Sun Windows menus and selection buffer.
    Copyright (C) 1987, 1999, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is probably totally obsolete.  In any case, the FSF is
 unwilling to support it.  We agreed to include it in our distribution
diff --git a/src/syntax.c b/src/syntax.c
index 52527a0516d..a9e6dda81fe 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1,6 +1,7 @@
 /* GNU Emacs routines to deal with syntax tables; also word and list parsing.
-   Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1994, 1995, 1997, 1998, 1999, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syntax.h b/src/syntax.h
index 92d55967b33..f64aa0e1327 100644
--- a/src/syntax.h
+++ b/src/syntax.h
@@ -1,6 +1,6 @@
 /* Declarations having to do with GNU Emacs syntax tables.
-   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1993, 1994, 1997, 1998, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sysdep.c b/src/sysdep.c
index 1068c7a1773..87998088753 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -1,6 +1,6 @@
 /* Interfaces to system-dependent kernel and library entries.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/sysselect.h b/src/sysselect.h
index ba204dafe3f..d72ff90ac0b 100644
--- a/src/sysselect.h
+++ b/src/sysselect.h
@@ -1,6 +1,6 @@
 /* sysselect.h - System-dependent definitions for the select function.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syssignal.h b/src/syssignal.h
index ac77759d258..69ff7a41bd1 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,6 +1,6 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1993, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -211,7 +211,7 @@ char *strsignal ();
 #ifdef HAVE_GTK_AND_PTHREAD
 #define SIGNAL_THREAD_CHECK(signo)                                      \
   do {                                                                  \
-    if (pthread_self () != main_thread)                                 \
+    if (!pthread_equal (pthread_self (), main_thread))			\
       {                                                                 \
         /* POSIX says any thread can receive the signal.  On GNU/Linux  \
            that is not true, but for other systems (FreeBSD at least)   \
diff --git a/src/systime.h b/src/systime.h
index e7ff2b2a3b7..ac28d883d64 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -1,6 +1,6 @@
 /* systime.h - System-dependent definitions for time manipulations.
    Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/systty.h b/src/systty.h
index 6d6a6f01ea9..d1eb3b84597 100644
--- a/src/systty.h
+++ b/src/systty.h
@@ -1,6 +1,6 @@
 /* systty.h - System-dependent definitions for terminals.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/syswait.h b/src/syswait.h
index bb4937f353e..e70e992d545 100644
--- a/src/syswait.h
+++ b/src/syswait.h
@@ -1,6 +1,6 @@
 /* Define wait system call interface for Emacs.
-   Copyright (C) 1993, 1994, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/term.c b/src/term.c
index 00c72ea8bee..a12f982844c 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1,6 +1,6 @@
 /* Terminal control module for terminals described by TERMCAP
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1998, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termcap.c b/src/termcap.c
index dee5465ebf9..111565131b5 100644
--- a/src/termcap.c
+++ b/src/termcap.c
@@ -1,6 +1,6 @@
 /* Work-alike for termcap, plus extra features.
    Copyright (C) 1985, 1986, 1993, 1994, 1995, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/src/termchar.h b/src/termchar.h
index c0d9895462e..9bc3e21d220 100644
--- a/src/termchar.h
+++ b/src/termchar.h
@@ -1,6 +1,6 @@
 /* Flags and parameters describing terminal's characteristics.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termhooks.h b/src/termhooks.h
index 98c4edb4f24..72e0940cea6 100644
--- a/src/termhooks.h
+++ b/src/termhooks.h
@@ -1,6 +1,6 @@
 /* Parameters and display hooks for terminal devices.
    Copyright (C) 1985, 1986, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/terminfo.c b/src/terminfo.c
index 7fccfaf1700..99f8b9a1e4e 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -1,6 +1,6 @@
 /* Interface from Emacs to terminfo.
-   Copyright (C) 1985, 1986, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/termopts.h b/src/termopts.h
index 8d776b3de38..082f9b15af7 100644
--- a/src/termopts.h
+++ b/src/termopts.h
@@ -1,6 +1,6 @@
 /* Flags and parameters describing user options for handling the terminal.
-   Copyright (C) 1985, 1986, 1990, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1990, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/textprop.c b/src/textprop.c
index a039c17ae64..b98acaeccd8 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -1,6 +1,6 @@
 /* Interface code for dealing with text properties.
    Copyright (C) 1993, 1994, 1995, 1997, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/tparam.c b/src/tparam.c
index ea04f7eaea1..dea57ff7461 100644
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,6 +1,6 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
diff --git a/src/uaf.h b/src/uaf.h
index 05a8651b6c2..c00fc7732fe 100644
--- a/src/uaf.h
+++ b/src/uaf.h
@@ -1,6 +1,6 @@
 /* GNU Emacs VMS UAF definition file.
-   Copyright (C) 1986, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/undo.c b/src/undo.c
index 3313c8e306c..0eca97df566 100644
--- a/src/undo.c
+++ b/src/undo.c
@@ -1,6 +1,6 @@
 /* undo handling for GNU Emacs.
-   Copyright (C) 1990, 1993, 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexaix.c b/src/unexaix.c
index 4785aa1dcb3..41324ac0fd8 100644
--- a/src/unexaix.c
+++ b/src/unexaix.c
@@ -1,6 +1,6 @@
 /* Dump an executable image.
-   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexalpha.c b/src/unexalpha.c
index ead259437f6..cbd44616bd4 100644
--- a/src/unexalpha.c
+++ b/src/unexalpha.c
@@ -1,7 +1,7 @@
 /* Unexec for DEC alpha.  schoepf@sc.ZIB-Berlin.DE (Rainer Schoepf).
 
-   Copyright (C) 1994, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexapollo.c b/src/unexapollo.c
index ace28dfa38d..27cf968c5fe 100644
--- a/src/unexapollo.c
+++ b/src/unexapollo.c
@@ -1,6 +1,6 @@
 /* unexapollo.c -- COFF File UNEXEC for GNU Emacs on Apollo SR10.x
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexconvex.c b/src/unexconvex.c
index 8409463b783..598b1b3428b 100644
--- a/src/unexconvex.c
+++ b/src/unexconvex.c
@@ -7,8 +7,8 @@
    think about it, or about whether other Emacs maintenance might
    break it.
 
-   Copyright (C) 1985, 1986, 1988, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1988, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexcw.c b/src/unexcw.c
index 92e313c05d6..f1023d4b239 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -1,7 +1,7 @@
 /* unexec() support for Cygwin;
    complete rewrite of xemacs Cygwin unexec() code
 
-   Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexec.c b/src/unexec.c
index 7fe7e26568c..16f9c96faa7 100644
--- a/src/unexec.c
+++ b/src/unexec.c
@@ -1,5 +1,5 @@
-/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+/* Copyright (C) 1985, 1986, 1987, 1988, 1992, 1993, 1994, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexelf.c b/src/unexelf.c
index a236b98eab1..7b2c72f0fa9 100644
--- a/src/unexelf.c
+++ b/src/unexelf.c
@@ -1,5 +1,5 @@
 /* Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexenix.c b/src/unexenix.c
index c1ad8bbf7eb..4d4bec11eb6 100644
--- a/src/unexenix.c
+++ b/src/unexenix.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexhp9k800.c b/src/unexhp9k800.c
deleted file mode 100644
index 146cc5707da..00000000000
--- a/src/unexhp9k800.c
+++ /dev/null
@@ -1,322 +0,0 @@
-/* Unexec for HP 9000 Series 800 machines.
-   Bob Desinger <hpsemc!bd@hplabs.hp.com>
-
-   Note that the GNU project considers support for HP operation a
-   peripheral activity which should not be allowed to divert effort
-   from development of the GNU system.  Changes in this code will be
-   installed when users send them in, but aside from that we don't
-   plan to think about it, or about whether other Emacs maintenance
-   might break it.
-
-
-  Unexec creates a copy of the old a.out file, and replaces the old data
-  area with the current data area.  When the new file is executed, the
-  process will see the same data structures and data values that the
-  original process had when unexec was called.
-
-  Unlike other versions of unexec, this one copies symbol table and
-  debug information to the new a.out file.  Thus, the new a.out file
-  may be debugged with symbolic debuggers.
-
-  If you fix any bugs in this, I'd like to incorporate your fixes.
-  Send them to uunet!hpda!hpsemc!jmorris or jmorris%hpsemc@hplabs.HP.COM.
-
-  CAVEATS:
-  This routine saves the current value of all static and external
-  variables.  This means that any data structure that needs to be
-  initialized must be explicitly reset.  Variables will not have their
-  expected default values.
-
-  Unfortunately, the HP-UX signal handler has internal initialization
-  flags which are not explicitly reset.  Thus, for signals to work in
-  conjunction with this routine, the following code must executed when
-  the new process starts up.
-
-  void _sigreturn ();
-  ...
-  sigsetreturn (_sigreturn);
-*/
-
-#ifdef emacs
-#include <config.h>
-#endif
-
-#include <stdio.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include <a.out.h>
-
-#ifdef HPUX_USE_SHLIBS
-#include <dl.h>
-#endif
-
-/* brk value to restore, stored as a global.
-   This is really used only if we used shared libraries.  */
-static long brk_on_dump = 0;
-
-/* Called from main, if we use shared libraries.  */
-int
-run_time_remap (ignored)
-     char *ignored;
-{
-  brk ((char *) brk_on_dump);
-}
-
-#undef roundup
-#define roundup(x,n) (((x) + ((n) - 1)) & ~((n) - 1))  /* n is power of 2 */
-#define min(x,y)  (((x) < (y)) ? (x) : (y))
-
-
-/* Create a new a.out file, same as old but with current data space */
-
-unexec (new_name, old_name, new_end_of_text, dummy1, dummy2)
-     char new_name[];		/* name of the new a.out file to be created */
-     char old_name[];		/* name of the old a.out file */
-     char *new_end_of_text;	/* ptr to new edata/etext; NOT USED YET */
-     int dummy1, dummy2;	/* not used by emacs */
-{
-  int old, new;
-  int old_size, new_size;
-  struct header hdr;
-  struct som_exec_auxhdr auxhdr;
-  long i;
-
-  /* For the greatest flexibility, should create a temporary file in
-     the same directory as the new file.  When everything is complete,
-     rename the temp file to the new name.
-     This way, a program could update its own a.out file even while
-     it is still executing.  If problems occur, everything is still
-     intact.  NOT implemented.  */
-
-  /* Open the input and output a.out files */
-  old = open (old_name, O_RDONLY);
-  if (old < 0)
-    { perror (old_name); exit (1); }
-  new = open (new_name, O_CREAT|O_RDWR|O_TRUNC, 0777);
-  if (new < 0)
-    { perror (new_name); exit (1); }
-
-  /* Read the old headers */
-  read_header (old, &hdr, &auxhdr);
-
-  brk_on_dump = (long) sbrk (0);
-
-  /* Decide how large the new and old data areas are */
-  old_size = auxhdr.exec_dsize;
-  /* I suspect these two statements are separate
-     to avoid a compiler bug in hpux version 8.  */
-  i = (long) sbrk (0);
-  new_size = i - auxhdr.exec_dmem;
-
-  /* Copy the old file to the new, up to the data space */
-  lseek (old, 0, 0);
-  copy_file (old, new, auxhdr.exec_dfile);
-
-  /* Skip the old data segment and write a new one */
-  lseek (old, old_size, 1);
-  save_data_space (new, &hdr, &auxhdr, new_size);
-
-  /* Copy the rest of the file */
-  copy_rest (old, new);
-
-  /* Update file pointers since we probably changed size of data area */
-  update_file_ptrs (new, &hdr, &auxhdr, auxhdr.exec_dfile, new_size-old_size);
-
-  /* Save the modified header */
-  write_header (new, &hdr, &auxhdr);
-
-  /* Close the binary file */
-  close (old);
-  close (new);
-  return 0;
-}
-
-/* Save current data space in the file, update header.  */
-
-save_data_space (file, hdr, auxhdr, size)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     int size;
-{
-  /* Write the entire data space out to the file */
-  if (write (file, auxhdr->exec_dmem, size) != size)
-    { perror ("Can't save new data space"); exit (1); }
-
-  /* Update the header to reflect the new data size */
-  auxhdr->exec_dsize = size;
-  auxhdr->exec_bsize = 0;
-}
-
-/* Update the values of file pointers when something is inserted.  */
-
-update_file_ptrs (file, hdr, auxhdr, location, offset)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-     unsigned int location;
-     int offset;
-{
-  struct subspace_dictionary_record subspace;
-  int i;
-
-  /* Increase the overall size of the module */
-  hdr->som_length += offset;
-
-  /* Update the various file pointers in the header */
-#define update(ptr) if (ptr > location) ptr = ptr + offset
-  update (hdr->aux_header_location);
-  update (hdr->space_strings_location);
-  update (hdr->init_array_location);
-  update (hdr->compiler_location);
-  update (hdr->symbol_location);
-  update (hdr->fixup_request_location);
-  update (hdr->symbol_strings_location);
-  update (hdr->unloadable_sp_location);
-  update (auxhdr->exec_tfile);
-  update (auxhdr->exec_dfile);
-
-  /* Do for each subspace dictionary entry */
-  lseek (file, hdr->subspace_location, 0);
-  for (i = 0; i < hdr->subspace_total; i++)
-    {
-      if (read (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-	{ perror ("Can't read subspace record"); exit (1); }
-
-      /* If subspace has a file location, update it */
-      if (subspace.initialization_length > 0
-	  && subspace.file_loc_init_value > location)
-	{
-	  subspace.file_loc_init_value += offset;
-	  lseek (file, -sizeof (subspace), 1);
-	  if (write (file, &subspace, sizeof (subspace)) != sizeof (subspace))
-	    { perror ("Can't update subspace record"); exit (1); }
-	}
-    }
-
-  /* Do for each initialization pointer record */
-  /* (I don't think it applies to executable files, only relocatables) */
-#undef update
-}
-
-/* Read in the header records from an a.out file.  */
-
-read_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-
-  /* Read the header in */
-  lseek (file, 0, 0);
-  if (read (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't read header from a.out file"); exit (1); }
-
-  if (hdr->a_magic != EXEC_MAGIC && hdr->a_magic != SHARE_MAGIC
-      &&  hdr->a_magic != DEMAND_MAGIC)
-    {
-      fprintf (stderr, "a.out file doesn't have legal magic number\n");
-      exit (1);
-    }
-
-  lseek (file, hdr->aux_header_location, 0);
-  if (read (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    {
-      perror ("Couldn't read auxiliary header from a.out file");
-      exit (1);
-    }
-}
-
-/* Write out the header records into an a.out file.  */
-
-write_header (file, hdr, auxhdr)
-     int file;
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Update the checksum */
-  hdr->checksum = calculate_checksum (hdr);
-
-  /* Write the header back into the a.out file */
-  lseek (file, 0, 0);
-  if (write (file, hdr, sizeof (*hdr)) != sizeof (*hdr))
-    { perror ("Couldn't write header to a.out file"); exit (1); }
-  lseek (file, hdr->aux_header_location, 0);
-  if (write (file, auxhdr, sizeof (*auxhdr)) != sizeof (*auxhdr))
-    { perror ("Couldn't write auxiliary header to a.out file"); exit (1); }
-}
-
-/* Calculate the checksum of a SOM header record. */
-
-calculate_checksum (hdr)
-     struct header *hdr;
-{
-  int checksum, i, *ptr;
-
-  checksum = 0;  ptr = (int *) hdr;
-
-  for (i = 0; i < sizeof (*hdr) / sizeof (int) - 1; i++)
-    checksum ^= ptr[i];
-
-  return (checksum);
-}
-
-/* Copy size bytes from the old file to the new one.  */
-
-copy_file (old, new, size)
-     int new, old;
-     int size;
-{
-  int len;
-  int buffer[8192];  /* word aligned will be faster */
-
-  for (; size > 0; size -= len)
-    {
-      len = min (size, sizeof (buffer));
-      if (read (old, buffer, len) != len)
-	{ perror ("Read failure on a.out file"); exit (1); }
-      if (write (new, buffer, len) != len)
-	{ perror ("Write failure in a.out file"); exit (1); }
-    }
-}
-
-/* Copy the rest of the file, up to EOF.  */
-
-copy_rest (old, new)
-     int new, old;
-{
-  int buffer[4096];
-  int len;
-
-  /* Copy bytes until end of file or error */
-  while ((len = read (old, buffer, sizeof (buffer))) > 0)
-    if (write (new, buffer, len) != len) break;
-
-  if (len != 0)
-    { perror ("Unable to copy the rest of the file"); exit (1); }
-}
-
-#ifdef	DEBUG
-display_header (hdr, auxhdr)
-     struct header *hdr;
-     struct som_exec_auxhdr *auxhdr;
-{
-  /* Display the header information (debug) */
-  printf ("\n\nFILE HEADER\n");
-  printf ("magic number %d \n", hdr->a_magic);
-  printf ("text loc %.8x   size %d \n", auxhdr->exec_tmem, auxhdr->exec_tsize);
-  printf ("data loc %.8x   size %d \n", auxhdr->exec_dmem, auxhdr->exec_dsize);
-  printf ("entry     %x \n",   auxhdr->exec_entry);
-  printf ("Bss  segment size %u\n", auxhdr->exec_bsize);
-  printf ("\n");
-  printf ("data file loc %d    size %d\n",
-	  auxhdr->exec_dfile, auxhdr->exec_dsize);
-  printf ("som_length %d\n", hdr->som_length);
-  printf ("unloadable sploc %d    size %d\n",
-	  hdr->unloadable_sp_location, hdr->unloadable_sp_size);
-}
-#endif /* DEBUG */
-
-/* arch-tag: d55a09ac-9427-4ec4-8496-cb9d7710774f
-   (do not change this comment) */
diff --git a/src/unexmacosx.c b/src/unexmacosx.c
index e95aa2f2efc..d38053c3155 100644
--- a/src/unexmacosx.c
+++ b/src/unexmacosx.c
@@ -1,6 +1,6 @@
 /* Dump Emacs in Mach-O format for use on Mac OS X.
    Copyright (C) 2001, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+                 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexmips.c b/src/unexmips.c
index 86129e052cf..d80bc62277e 100644
--- a/src/unexmips.c
+++ b/src/unexmips.c
@@ -6,8 +6,8 @@
    we don't plan to think about it, or about whether other Emacs
    maintenance might break it.
 
-   Copyright (C) 1988, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1988, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexnext.c b/src/unexnext.c
index b453da3b023..937e5d2b80b 100644
--- a/src/unexnext.c
+++ b/src/unexnext.c
@@ -1,6 +1,6 @@
 /* Dump Emacs in macho format.
-   Copyright (C) 1990, 1993, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
    Written by Bradley Taylor (btaylor@next.com).
 
 This file is part of GNU Emacs.
diff --git a/src/unexsni.c b/src/unexsni.c
index 8d72acf1a18..def59c6ea84 100644
--- a/src/unexsni.c
+++ b/src/unexsni.c
@@ -1,6 +1,7 @@
 /* Unexec for Siemens machines running Sinix (modified SVR4).
-   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2002,
-                 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1994, 1995, 2001,
+                 2002, 2003, 2004, 2005, 2006, 2007
+                 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexsunos4.c b/src/unexsunos4.c
index 19d982f6140..e8051fc7e88 100644
--- a/src/unexsunos4.c
+++ b/src/unexsunos4.c
@@ -1,6 +1,6 @@
 /* Unexec for Sunos 4 using shared libraries.
-   Copyright (C) 1990, 1994, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1994, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/unexw32.c b/src/unexw32.c
index 6256062aa3f..ae2fe942c73 100644
--- a/src/unexw32.c
+++ b/src/unexw32.c
@@ -1,6 +1,6 @@
 /* unexec for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/vm-limit.c b/src/vm-limit.c
index cadfb4cc95a..192775df81c 100644
--- a/src/vm-limit.c
+++ b/src/vm-limit.c
@@ -1,6 +1,6 @@
 /* Functions for memory limit warnings.
-   Copyright (C) 1990, 1992, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1992, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w16select.c b/src/w16select.c
index ea9d9aea190..82619c15833 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -1,6 +1,6 @@
 /* 16-bit Windows Selection processing for emacs on MS-Windows
    Copyright (C) 1996, 1997, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32.c b/src/w32.c
index 9fe88833b4f..87ae9d9f8fd 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -1,6 +1,6 @@
 /* Utility and Unix shadow routines for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1994, 1995, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32.h b/src/w32.h
index 6ba25a42403..b6fb23dc14d 100644
--- a/src/w32.h
+++ b/src/w32.h
@@ -2,8 +2,8 @@
 #define EMACS_W32_H
 
 /* Support routines for the NT version of Emacs.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.c b/src/w32bdf.c
index 89d88574188..64ec2f7a3b0 100644
--- a/src/w32bdf.c
+++ b/src/w32bdf.c
@@ -1,6 +1,6 @@
 /* Implementation of BDF font handling on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32bdf.h b/src/w32bdf.h
index dd8cfa276bf..ba408793882 100644
--- a/src/w32bdf.h
+++ b/src/w32bdf.h
@@ -1,6 +1,6 @@
 /* Definitions and header for handling BDF fonts on the Microsoft W32 API.
-   Copyright (C) 1999, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32console.c b/src/w32console.c
index 0fc652bf55f..d2f0e06a64d 100644
--- a/src/w32console.c
+++ b/src/w32console.c
@@ -1,6 +1,6 @@
 /* Terminal hooks for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32fns.c b/src/w32fns.c
index 34cfb0a2882..885ade0e4bb 100644
--- a/src/w32fns.c
+++ b/src/w32fns.c
@@ -1,6 +1,6 @@
 /* Graphical user interface functions for the Microsoft W32 API.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32gui.h b/src/w32gui.h
index 2b1a11987f3..18c737a6e12 100644
--- a/src/w32gui.h
+++ b/src/w32gui.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.c b/src/w32heap.c
index e1bdd867721..9327e7e7e7e 100644
--- a/src/w32heap.c
+++ b/src/w32heap.c
@@ -1,6 +1,6 @@
 /* Heap management routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32heap.h b/src/w32heap.h
index c862558b1cf..0d4ccb70b8a 100644
--- a/src/w32heap.h
+++ b/src/w32heap.h
@@ -1,6 +1,6 @@
 /* Heap management routines (including unexec) for GNU Emacs on Windows NT.
-   Copyright (C) 1994, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.c b/src/w32inevt.c
index 0fededa6aea..b44054afef3 100644
--- a/src/w32inevt.c
+++ b/src/w32inevt.c
@@ -1,6 +1,6 @@
 /* Input event support for Emacs on the Microsoft W32 API.
-   Copyright (C) 1992, 1993, 1995, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 1995, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32inevt.h b/src/w32inevt.h
index 8985df1ee69..f0f7f232261 100644
--- a/src/w32inevt.h
+++ b/src/w32inevt.h
@@ -1,6 +1,6 @@
 /* Input routines for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1995, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1995, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32menu.c b/src/w32menu.c
index d5c38bee336..a3bd82a0d7d 100644
--- a/src/w32menu.c
+++ b/src/w32menu.c
@@ -1,6 +1,6 @@
 /* Menu support for GNU Emacs on the Microsoft W32 API.
-   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1986, 1988, 1993, 1994, 1996, 1998, 1999, 2001, 2002,
+                 2003, 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32proc.c b/src/w32proc.c
index 7d27172781d..2120a51fb89 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -1,6 +1,6 @@
 /* Process support for GNU Emacs on the Microsoft W32 API.
    Copyright (C) 1992, 1995, 1999, 2000, 2001, 2002, 2003, 2004,
-		 2005, 2006 Free Software Foundation, Inc.
+		 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32reg.c b/src/w32reg.c
index cd2a3bdf755..37659ecb9ca 100644
--- a/src/w32reg.c
+++ b/src/w32reg.c
@@ -1,6 +1,6 @@
 /* Emulate the X Resource Manager through the registry.
-   Copyright (C) 1990, 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32select.c b/src/w32select.c
index 99825c23911..ad5d0e67f83 100644
--- a/src/w32select.c
+++ b/src/w32select.c
@@ -1,6 +1,6 @@
 /* Selection processing for Emacs on the Microsoft W32 API.
-   Copyright (C) 1993, 1994, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1994, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32term.c b/src/w32term.c
index 007f9d83afb..8044e23d5ae 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -1,6 +1,6 @@
 /* Implementation of GUI terminal on the Microsoft W32 API.
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32term.h b/src/w32term.h
index f587d74a485..ac312c84a19 100644
--- a/src/w32term.h
+++ b/src/w32term.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication on the Microsoft W32 API.
    Copyright (C) 1995, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/w32xfns.c b/src/w32xfns.c
index 0e937e9950c..b87cc28f057 100644
--- a/src/w32xfns.c
+++ b/src/w32xfns.c
@@ -1,6 +1,6 @@
 /* Functions taken directly from X sources for use with the Microsoft W32 API.
-   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1992, 1993, 1994, 1995, 1999, 2001, 2002, 2003,
+                 2004, 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.c b/src/widget.c
index 2e9913308d0..883be9a23f4 100644
--- a/src/widget.c
+++ b/src/widget.c
@@ -1,6 +1,6 @@
 /* The emacs frame widget.
-   Copyright (C) 1992, 1993, 2000, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 1992, 1993, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widget.h b/src/widget.h
index b6c5e9f0bcb..21cd4543230 100644
--- a/src/widget.h
+++ b/src/widget.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget public header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/widgetprv.h b/src/widgetprv.h
index bde384d3b5f..ac845209ba6 100644
--- a/src/widgetprv.h
+++ b/src/widgetprv.h
@@ -1,6 +1,6 @@
 /* The emacs frame widget private header file.
-   Copyright (C) 1993, 2002, 2003, 2004, 2005,
-                 2006 Free Software Foundation, Inc.
+   Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/window.c b/src/window.c
index 00a2e06bdeb..57a818eeee6 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1,7 +1,7 @@
 /* Window creation, deletion and examination for GNU Emacs.
    Does not include redisplay.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1996, 1997, 1998, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -3268,10 +3268,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
   struct window *w = XWINDOW (window);
   struct buffer *b = XBUFFER (buffer);
   int count = SPECPDL_INDEX ();
-#ifdef HAVE_WINDOW_SYSTEM
-  struct frame *f = XFRAME (w->frame);
-  Display_Info *dpyinfo;
-#endif
 
   w->buffer = buffer;
 
@@ -3352,15 +3348,6 @@ set_window_buffer (window, buffer, run_hooks_p, keep_margins_p)
 	call1 (Vrun_hooks, Qwindow_configuration_change_hook);
     }
 
-#ifdef HAVE_WINDOW_SYSTEM
-  BLOCK_INPUT;
-  if (f && FRAME_WINDOW_P (f) && FRAME_X_OUTPUT (f)
-      && (dpyinfo = FRAME_X_DISPLAY_INFO (f))
-      && EQ (window, dpyinfo->mouse_face_window))
-    clear_mouse_face (dpyinfo);
-  UNBLOCK_INPUT;
-#endif
-
   unbind_to (count, Qnil);
 }
 
diff --git a/src/window.h b/src/window.h
index 03f416aa9bc..51c0c8a58f6 100644
--- a/src/window.h
+++ b/src/window.h
@@ -1,6 +1,6 @@
 /* Window definitions for GNU Emacs.
    Copyright (C) 1985, 1986, 1993, 1995, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index a007cd52236..1885735d327 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1,7 +1,7 @@
 /* Display generation from window structure and buffer text.
    Copyright (C) 1985, 1986, 1987, 1988, 1993, 1994, 1995,
                  1997, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -13550,6 +13550,7 @@ try_window (window, pos, check_margins)
   struct window *w = XWINDOW (window);
   struct it it;
   struct glyph_row *last_text_row = NULL;
+  struct frame *f = XFRAME (w->frame);
 
   /* Make POS the new window start.  */
   set_marker_both (w->start, Qnil, CHARPOS (pos), BYTEPOS (pos));
diff --git a/src/xfaces.c b/src/xfaces.c
index ec20445b7dc..52252001137 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -1,6 +1,6 @@
 /* xfaces.c -- "Face" primitives.
    Copyright (C) 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xfns.c b/src/xfns.c
index 8b4ab0ca363..ec9d54dcf93 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,6 +1,6 @@
 /* Functions for the X window system.
    Copyright (C) 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xmenu.c b/src/xmenu.c
index b4665f88e07..a30016e2477 100644
--- a/src/xmenu.c
+++ b/src/xmenu.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1986, 1988, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xrdb.c b/src/xrdb.c
index 988db614c41..4c9f3c60b35 100644
--- a/src/xrdb.c
+++ b/src/xrdb.c
@@ -1,6 +1,6 @@
 /* Deal with the X Resource Manager.
    Copyright (C) 1990, 1993, 1994, 2000, 2001, 2002, 2003, 2004,
-                 2005, 2006 Free Software Foundation, Inc.
+                 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xselect.c b/src/xselect.c
index 54b20d89d5f..f34b62c8700 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1,6 +1,6 @@
 /* X Selection processing for Emacs.
    Copyright (C) 1993, 1994, 1995, 1996, 1997, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xsmfns.c b/src/xsmfns.c
index 1e4618ed567..7a78a8e60e6 100644
--- a/src/xsmfns.c
+++ b/src/xsmfns.c
@@ -1,6 +1,6 @@
 /* Session management module for systems which understand the X Session
    management protocol.
-   Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.c b/src/xterm.c
index 122d9b7c3de..5a8d50db072 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -1,6 +1,6 @@
 /* X Communication module for terminals which understand the X protocol.
    Copyright (C) 1989, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-                 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/src/xterm.h b/src/xterm.h
index b8e86d646ed..34583221ad3 100644
--- a/src/xterm.h
+++ b/src/xterm.h
@@ -1,6 +1,6 @@
 /* Definitions and headers for communication with X protocol.
    Copyright (C) 1989, 1993, 1994, 1998, 1999, 2000, 2001, 2002, 2003,
-                 2004, 2005, 2006 Free Software Foundation, Inc.
+                 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
diff --git a/update-subdirs b/update-subdirs
index 804097a0d06..2ce9a3de889 100755
--- a/update-subdirs
+++ b/update-subdirs
@@ -2,7 +2,7 @@
 # Write into $1/subdirs.el a list of subdirs of directory $1.
 
 # Copyright (C) 1994, 1995, 1997, 1999, 2001, 2002, 2003, 2004, 2005,
-#   2006  Free Software Foundation, Inc.
+#   2006, 2007  Free Software Foundation, Inc.
 #
 # This file is part of GNU Emacs.
 #
diff --git a/vms/make-mms-derivative.el b/vms/make-mms-derivative.el
index d74a6582ca4..4d226374cfd 100644
--- a/vms/make-mms-derivative.el
+++ b/vms/make-mms-derivative.el
@@ -1,6 +1,6 @@
 ;;; make-mms-derivative.el --- framework to do horrible things for VMS support
 
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Thien-Thi Nguyen <ttn@gnu.org>
 ;; Keywords: maint build vms mms makefile levitte autoconf war-is-a-lose