Merge commit '6bf96861b98e91ca9c3bd146697580b42d30f5d9'

diff --combined packages/gnome-c-style/gnome-c-align.el
index 64b8178c774848f4eca597b7dbf606d563482527,446b48f341564e2d9f75ddee28126eab6ace784c..446b48f341564e2d9f75ddee28126eab6ace784c
--- 1/packages/gnome-c-style/gnome-c-align.el
--- 2/gnome-c-align.el
+++ b/packages/gnome-c-style/gnome-c-align.el
@@@ -4,21 -4,20 +4,20 @@@
  ;; Author: Daiki Ueno <ueno@gnu.org>
  ;; Keywords: GNOME, C, coding style
  
- ;; This file is not part of GNU Emacs.
+ ;; This file is part of GNU Emacs.
  
- ;; 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 3 of the
- ;; License, or (at your option) any later version.
+ ;; 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 3 of the License, or
+ ;; (at your option) any later version.
  
- ;; This program 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.
+ ;; 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 this program.  If not, see
- ;; <http://www.gnu.org/licenses/>.
+ ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  
  ;;; Code:
  

diff --combined packages/gnome-c-style/gnome-c-snippet.el
index ed3633672924a1769daf765ff4762c54ad315d41,239f148bc17784da8319f92d497a90c5615ceb13..239f148bc17784da8319f92d497a90c5615ceb13
--- 1/packages/gnome-c-style/gnome-c-snippet.el
--- 2/gnome-c-snippet.el
+++ b/packages/gnome-c-style/gnome-c-snippet.el
@@@ -4,21 -4,20 +4,20 @@@
  ;; Author: Daiki Ueno <ueno@gnu.org>
  ;; Keywords: GNOME, C, coding style
  
- ;; This file is not part of GNU Emacs.
+ ;; This file is part of GNU Emacs.
  
- ;; 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 3 of the
- ;; License, or (at your option) any later version.
+ ;; 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 3 of the License, or
+ ;; (at your option) any later version.
  
- ;; This program 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.
+ ;; 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 this program.  If not, see
- ;; <http://www.gnu.org/licenses/>.
+ ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  
  ;;; Commentary:
  

diff --combined packages/gnome-c-style/gnome-c-style.el
index 589de3c6734e6c10d28faf595b44993236cb3032,b7615d75e3ebfca3a0fc3308db275497584daf68..b7615d75e3ebfca3a0fc3308db275497584daf68
--- 1/packages/gnome-c-style/gnome-c-style.el
--- 2/gnome-c-style.el
+++ b/packages/gnome-c-style/gnome-c-style.el
@@@ -6,21 -6,20 +6,20 @@@
  ;; Version: 0.1
  ;; Maintainer: Daiki Ueno <ueno@gnu.org>
  
- ;; This file is not part of GNU Emacs.
+ ;; This file is part of GNU Emacs.
  
- ;; 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 3 of the
- ;; License, or (at your option) any later version.
+ ;; 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 3 of the License, or
+ ;; (at your option) any later version.
  
- ;; This program 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.
+ ;; 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 this program.  If not, see
- ;; <http://www.gnu.org/licenses/>.
+ ;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
  
  ;;; Commentary: