Fixing the license text.

svn path=/trunk/; revision=14212

57 files changed, 0 insertions, 57 deletions

diff --git a/camel/providers/imap/camel-imap-command.h b/camel/providers/imap/camel-imap-command.h
index da7ce3f9f6..69c28237cc 100644
--- a/camel/providers/imap/camel-imap-command.h
+++ b/camel/providers/imap/camel-imap-command.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6df3833db1..e1bd4bc101 100644
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-folder.h b/camel/providers/imap/camel-imap-folder.h
index 888c5d8f0a..05e46ce6a1 100644
--- a/camel/providers/imap/camel-imap-folder.h
+++ b/camel/providers/imap/camel-imap-folder.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-message-cache.c b/camel/providers/imap/camel-imap-message-cache.c
index 1758377696..ab5d125d6e 100644
--- a/camel/providers/imap/camel-imap-message-cache.c
+++ b/camel/providers/imap/camel-imap-message-cache.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-message-cache.h b/camel/providers/imap/camel-imap-message-cache.h
index 5f05e337e0..efdc832694 100644
--- a/camel/providers/imap/camel-imap-message-cache.h
+++ b/camel/providers/imap/camel-imap-message-cache.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-private.h b/camel/providers/imap/camel-imap-private.h
index 187b145e00..07b790c6a1 100644
--- a/camel/providers/imap/camel-imap-private.h
+++ b/camel/providers/imap/camel-imap-private.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-store.h b/camel/providers/imap/camel-imap-store.h
index adbbf7ba34..66ebe13f1d 100644
--- a/camel/providers/imap/camel-imap-store.h
+++ b/camel/providers/imap/camel-imap-store.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-types.h b/camel/providers/imap/camel-imap-types.h
index 9714fd21be..c5ea41acff 100644
--- a/camel/providers/imap/camel-imap-types.h
+++ b/camel/providers/imap/camel-imap-types.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-wrapper.c b/camel/providers/imap/camel-imap-wrapper.c
index f75c7070e8..53646bb201 100644
--- a/camel/providers/imap/camel-imap-wrapper.c
+++ b/camel/providers/imap/camel-imap-wrapper.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/imap/camel-imap-wrapper.h b/camel/providers/imap/camel-imap-wrapper.h
index f0b6ceff24..4f7ca5097a 100644
--- a/camel/providers/imap/camel-imap-wrapper.h
+++ b/camel/providers/imap/camel-imap-wrapper.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-folder.c b/camel/providers/local/camel-local-folder.c
index 985081a266..6077a66da0 100644
--- a/camel/providers/local/camel-local-folder.c
+++ b/camel/providers/local/camel-local-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-folder.h b/camel/providers/local/camel-local-folder.h
index cb4cabe641..3eb4b02c32 100644
--- a/camel/providers/local/camel-local-folder.h
+++ b/camel/providers/local/camel-local-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-private.h b/camel/providers/local/camel-local-private.h
index d193524a3c..4dfe9f635c 100644
--- a/camel/providers/local/camel-local-private.h
+++ b/camel/providers/local/camel-local-private.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-provider.c b/camel/providers/local/camel-local-provider.c
index a5bb651d27..f4a4301022 100644
--- a/camel/providers/local/camel-local-provider.c
+++ b/camel/providers/local/camel-local-provider.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-store.c b/camel/providers/local/camel-local-store.c
index 912494232d..918b8db420 100644
--- a/camel/providers/local/camel-local-store.c
+++ b/camel/providers/local/camel-local-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-local-store.h b/camel/providers/local/camel-local-store.h
index 3c8eb35a1a..21d854c562 100644
--- a/camel/providers/local/camel-local-store.h
+++ b/camel/providers/local/camel-local-store.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-folder.c b/camel/providers/local/camel-maildir-folder.c
index e786833074..fc9ab999cb 100644
--- a/camel/providers/local/camel-maildir-folder.c
+++ b/camel/providers/local/camel-maildir-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-folder.h b/camel/providers/local/camel-maildir-folder.h
index 6e93aa4ab1..c495d9b14d 100644
--- a/camel/providers/local/camel-maildir-folder.h
+++ b/camel/providers/local/camel-maildir-folder.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-store.c b/camel/providers/local/camel-maildir-store.c
index ae06d372b8..4d754e5f12 100644
--- a/camel/providers/local/camel-maildir-store.c
+++ b/camel/providers/local/camel-maildir-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-maildir-store.h b/camel/providers/local/camel-maildir-store.h
index 9882485d2a..f7725bc189 100644
--- a/camel/providers/local/camel-maildir-store.h
+++ b/camel/providers/local/camel-maildir-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-folder.c b/camel/providers/local/camel-mbox-folder.c
index 7f1162d538..534269d455 100644
--- a/camel/providers/local/camel-mbox-folder.c
+++ b/camel/providers/local/camel-mbox-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-folder.h b/camel/providers/local/camel-mbox-folder.h
index fa521f904e..aa0b67201f 100644
--- a/camel/providers/local/camel-mbox-folder.h
+++ b/camel/providers/local/camel-mbox-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-store.c b/camel/providers/local/camel-mbox-store.c
index 280e9d049c..f401632b8d 100644
--- a/camel/providers/local/camel-mbox-store.c
+++ b/camel/providers/local/camel-mbox-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mbox-store.h b/camel/providers/local/camel-mbox-store.h
index 6cce47538d..5b6fbdd926 100644
--- a/camel/providers/local/camel-mbox-store.h
+++ b/camel/providers/local/camel-mbox-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-folder.c b/camel/providers/local/camel-mh-folder.c
index 109d1232f5..6795ab3fbf 100644
--- a/camel/providers/local/camel-mh-folder.c
+++ b/camel/providers/local/camel-mh-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-folder.h b/camel/providers/local/camel-mh-folder.h
index 544ef271cd..125f8c8ac5 100644
--- a/camel/providers/local/camel-mh-folder.h
+++ b/camel/providers/local/camel-mh-folder.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-store.c b/camel/providers/local/camel-mh-store.c
index dd44f015e7..8b8c2e5f0e 100644
--- a/camel/providers/local/camel-mh-store.c
+++ b/camel/providers/local/camel-mh-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-mh-store.h b/camel/providers/local/camel-mh-store.h
index f83404f85e..b69bddb7c2 100644
--- a/camel/providers/local/camel-mh-store.h
+++ b/camel/providers/local/camel-mh-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-folder.c b/camel/providers/local/camel-spool-folder.c
index afec08382d..298f04428e 100644
--- a/camel/providers/local/camel-spool-folder.c
+++ b/camel/providers/local/camel-spool-folder.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-folder.h b/camel/providers/local/camel-spool-folder.h
index 04a79b274b..717ec4abd9 100644
--- a/camel/providers/local/camel-spool-folder.h
+++ b/camel/providers/local/camel-spool-folder.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-store.c b/camel/providers/local/camel-spool-store.c
index c16d106f07..fdf5640d99 100644
--- a/camel/providers/local/camel-spool-store.c
+++ b/camel/providers/local/camel-spool-store.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/local/camel-spool-store.h b/camel/providers/local/camel-spool-store.h
index 74a8495d91..677f6aa0ed 100644
--- a/camel/providers/local/camel-spool-store.h
+++ b/camel/providers/local/camel-spool-store.h
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
index b3f788269f..f8d3a62e27 100644
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ b/camel/providers/nntp/camel-nntp-auth.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
index 67636dbc21..fc96cf6a4e 100644
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ b/camel/providers/nntp/camel-nntp-auth.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 1de28c16ab..9f291d9fb8 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
index 6acbf09f9e..223323cb95 100644
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ b/camel/providers/nntp/camel-nntp-folder.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
index ff2bf7b2e5..7f3850f9c1 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ b/camel/providers/nntp/camel-nntp-grouplist.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
index 6ee18a5320..edd1e64cb9 100644
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ b/camel/providers/nntp/camel-nntp-grouplist.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index 3e0d0ac206..8c7ef1d5cd 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -6,7 +6,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
index e529c9b1e1..773e3d7e0e 100644
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ b/camel/providers/nntp/camel-nntp-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
index 6c00c5745d..d9aace81ef 100644
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ b/camel/providers/nntp/camel-nntp-resp-codes.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
index c2ee46348b..9ff097f7f5 100644
--- a/camel/providers/nntp/camel-nntp-store.c
+++ b/camel/providers/nntp/camel-nntp-store.c
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index 02cca63e46..0f373dd0bc 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -7,7 +7,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
index 81cc334a67..a37179c521 100644
--- a/camel/providers/nntp/camel-nntp-types.h
+++ b/camel/providers/nntp/camel-nntp-types.h
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
index 46dac10bf6..5f26d7100f 100644
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ b/camel/providers/nntp/camel-nntp-utils.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
index 7d648bff5c..48fd7490c9 100644
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ b/camel/providers/nntp/camel-nntp-utils.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 0801d6d83f..5452144eab 100644
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-folder.h b/camel/providers/pop3/camel-pop3-folder.h
index 15a29585bb..0b6296a09c 100644
--- a/camel/providers/pop3/camel-pop3-folder.h
+++ b/camel/providers/pop3/camel-pop3-folder.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-provider.c b/camel/providers/pop3/camel-pop3-provider.c
index 91b9a94137..9e7a022482 100644
--- a/camel/providers/pop3/camel-pop3-provider.c
+++ b/camel/providers/pop3/camel-pop3-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c
index 42a35794d1..e959aa2de3 100644
--- a/camel/providers/pop3/camel-pop3-store.c
+++ b/camel/providers/pop3/camel-pop3-store.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/pop3/camel-pop3-store.h b/camel/providers/pop3/camel-pop3-store.h
index 89814845a3..fcc488f3e8 100644
--- a/camel/providers/pop3/camel-pop3-store.h
+++ b/camel/providers/pop3/camel-pop3-store.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-provider.c b/camel/providers/sendmail/camel-sendmail-provider.c
index 4f0ad07766..4d546a081d 100644
--- a/camel/providers/sendmail/camel-sendmail-provider.c
+++ b/camel/providers/sendmail/camel-sendmail-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-transport.c b/camel/providers/sendmail/camel-sendmail-transport.c
index f218dacb24..28bc488c1d 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.c
+++ b/camel/providers/sendmail/camel-sendmail-transport.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/sendmail/camel-sendmail-transport.h b/camel/providers/sendmail/camel-sendmail-transport.h
index 74b58811d9..056be03bc8 100644
--- a/camel/providers/sendmail/camel-sendmail-transport.h
+++ b/camel/providers/sendmail/camel-sendmail-transport.h
@@ -10,7 +10,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-provider.c b/camel/providers/smtp/camel-smtp-provider.c
index 9c25186e83..13f0cb6369 100644
--- a/camel/providers/smtp/camel-smtp-provider.c
+++ b/camel/providers/smtp/camel-smtp-provider.c
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-transport.c b/camel/providers/smtp/camel-smtp-transport.c
index 2b35f49e15..c37b35ce44 100644
--- a/camel/providers/smtp/camel-smtp-transport.c
+++ b/camel/providers/smtp/camel-smtp-transport.c
@@ -8,7 +8,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
diff --git a/camel/providers/smtp/camel-smtp-transport.h b/camel/providers/smtp/camel-smtp-transport.h
index dba6369bb4..7a6b631c46 100644
--- a/camel/providers/smtp/camel-smtp-transport.h
+++ b/camel/providers/smtp/camel-smtp-transport.h
@@ -9,7 +9,6 @@
  *
  * This program is free software; you can redistribute it and/or 
  * modify it under the terms of version 2 of the GNU General Public 
- * published by the Free Software Foundation; either version 2 of the
  * License as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,