Merge revisions 36016:36303 from trunk.

svn path=/branches/kill-bonobo/; revision=36307

1 files changed, 12 insertions, 16 deletions

diff --git a/mail/mail-autofilter.c b/mail/mail-autofilter.c
index f19512e892..af5f26093f 100644
--- a/mail/mail-autofilter.c
+++ b/mail/mail-autofilter.c
@@ -1,29 +1,25 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* mail-autofilter.c
- *
- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
+/*
+ * Code for autogenerating rules or filters from a message.
  *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) version 3.
  *
  * 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.
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with the program; if not, see <http://www.gnu.org/licenses/>  
  *
  * Authors:
- *   Michael Zucchi <notzed@ximian.com>
- *   Ettore Perazzoli <ettore@ximian.com>
+ *		Michael Zucchi <notzed@ximian.com>
+ *		Ettore Perazzoli <ettore@ximian.com>
+ *
+ * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com)
  */
-
-/* Code for autogenerating rules or filters from a message.  */
-
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif