diff -ur bzr-fastimport-0.11.0.orig/branch_mapper.py bzr-fastimport-0.11.0/branch_mapper.py
--- bzr-fastimport-0.11.0.orig/branch_mapper.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/branch_mapper.py	2011-10-06 09:10:34.331911179 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An object that maps git ref names to bzr branch names.  Note that it is not
 used to map git ref names to bzr tag names."""
diff -ur bzr-fastimport-0.11.0.orig/branch_updater.py bzr-fastimport-0.11.0/branch_updater.py
--- bzr-fastimport-0.11.0.orig/branch_updater.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/branch_updater.py	2011-10-06 09:10:34.331911179 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An object that updates a bunch of branches based on data imported."""
 
diff -ur bzr-fastimport-0.11.0.orig/bzr_commit_handler.py bzr-fastimport-0.11.0/bzr_commit_handler.py
--- bzr-fastimport-0.11.0.orig/bzr_commit_handler.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/bzr_commit_handler.py	2011-10-06 09:10:34.332911202 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """CommitHandlers that build and save revisions & their inventories."""
 
diff -ur bzr-fastimport-0.11.0.orig/cache_manager.py bzr-fastimport-0.11.0/cache_manager.py
--- bzr-fastimport-0.11.0.orig/cache_manager.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/cache_manager.py	2011-10-06 09:10:34.332911202 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """A manager of caches."""
 
diff -ur bzr-fastimport-0.11.0.orig/cmds.py bzr-fastimport-0.11.0/cmds.py
--- bzr-fastimport-0.11.0.orig/cmds.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/cmds.py	2011-10-06 09:10:34.332911202 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Fastimport/fastexport commands."""
 
diff -ur bzr-fastimport-0.11.0.orig/exporter.py bzr-fastimport-0.11.0/exporter.py
--- bzr-fastimport-0.11.0.orig/exporter.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/exporter.py	2011-10-06 09:10:34.332911202 +1000
@@ -13,8 +13,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # Original Copyright (c) 2008 Adeodato Simó
 # Original License: MIT (See exporters/bzr-fast-export.LICENSE)
diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/d2x bzr-fastimport-0.11.0/exporters/darcs/d2x
--- bzr-fastimport-0.11.0.orig/exporters/darcs/d2x	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/exporters/darcs/d2x	2011-10-06 09:10:34.333911225 +1000
@@ -15,9 +15,7 @@
 #   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, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 usage()
diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/git-darcs bzr-fastimport-0.11.0/exporters/darcs/git-darcs
--- bzr-fastimport-0.11.0.orig/exporters/darcs/git-darcs	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/exporters/darcs/git-darcs	2011-10-06 09:10:34.345911503 +1000
@@ -19,9 +19,7 @@
 #   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, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 add()
diff -ur bzr-fastimport-0.11.0.orig/exporters/darcs/x2d bzr-fastimport-0.11.0/exporters/darcs/x2d
--- bzr-fastimport-0.11.0.orig/exporters/darcs/x2d	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/exporters/darcs/x2d	2011-10-06 09:10:34.346911526 +1000
@@ -15,9 +15,7 @@
 #   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, write to the Free Software
-#   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
-#   USA.
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 usage()
diff -ur bzr-fastimport-0.11.0.orig/exporters/__init__.py bzr-fastimport-0.11.0/exporters/__init__.py
--- bzr-fastimport-0.11.0.orig/exporters/__init__.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/exporters/__init__.py	2011-10-06 09:10:34.346911526 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Simplified and unified access to the various xxx-fast-export tools."""
 
diff -ur bzr-fastimport-0.11.0.orig/helpers.py bzr-fastimport-0.11.0/helpers.py
--- bzr-fastimport-0.11.0.orig/helpers.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/helpers.py	2011-10-06 09:10:34.347911549 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Miscellaneous useful stuff."""
 
diff -ur bzr-fastimport-0.11.0.orig/__init__.py bzr-fastimport-0.11.0/__init__.py
--- bzr-fastimport-0.11.0.orig/__init__.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/__init__.py	2011-10-06 09:10:34.347911549 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 r"""FastImport Plugin
 =================
diff -ur bzr-fastimport-0.11.0.orig/marks_file.py bzr-fastimport-0.11.0/marks_file.py
--- bzr-fastimport-0.11.0.orig/marks_file.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/marks_file.py	2011-10-06 09:10:34.348911572 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Routines for reading/writing a marks file."""
 
diff -ur bzr-fastimport-0.11.0.orig/processors/generic_processor.py bzr-fastimport-0.11.0/processors/generic_processor.py
--- bzr-fastimport-0.11.0.orig/processors/generic_processor.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/processors/generic_processor.py	2011-10-06 09:10:34.349911595 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Import processor that supports all Bazaar repository formats."""
 
diff -ur bzr-fastimport-0.11.0.orig/processors/__init__.py bzr-fastimport-0.11.0/processors/__init__.py
--- bzr-fastimport-0.11.0.orig/processors/__init__.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/processors/__init__.py	2011-10-06 09:10:34.350911618 +1000
@@ -11,7 +11,6 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Actual import processors."""
diff -ur bzr-fastimport-0.11.0.orig/revision_store.py bzr-fastimport-0.11.0/revision_store.py
--- bzr-fastimport-0.11.0.orig/revision_store.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/revision_store.py	2011-10-06 09:10:34.351911641 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """An abstraction of a repository providing just the bits importing needs."""
 
diff -ur bzr-fastimport-0.11.0.orig/tests/__init__.py bzr-fastimport-0.11.0/tests/__init__.py
--- bzr-fastimport-0.11.0.orig/tests/__init__.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/__init__.py	2011-10-06 09:07:09.172162206 +1000
@@ -10,8 +10,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 """Tests for bzr-fastimport."""
diff -ur bzr-fastimport-0.11.0.orig/tests/test_branch_mapper.py bzr-fastimport-0.11.0/tests/test_branch_mapper.py
--- bzr-fastimport-0.11.0.orig/tests/test_branch_mapper.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/test_branch_mapper.py	2011-10-06 09:10:34.351911641 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the BranchMapper methods."""
 
diff -ur bzr-fastimport-0.11.0.orig/tests/test_commands.py bzr-fastimport-0.11.0/tests/test_commands.py
--- bzr-fastimport-0.11.0.orig/tests/test_commands.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/test_commands.py	2011-10-06 09:10:34.352911664 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the command implementations."""
 
diff -ur bzr-fastimport-0.11.0.orig/tests/test_exporter.py bzr-fastimport-0.11.0/tests/test_exporter.py
--- bzr-fastimport-0.11.0.orig/tests/test_exporter.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/test_exporter.py	2011-10-06 09:10:34.352911664 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Test the exporter."""
 
diff -ur bzr-fastimport-0.11.0.orig/tests/test_generic_processor.py bzr-fastimport-0.11.0/tests/test_generic_processor.py
--- bzr-fastimport-0.11.0.orig/tests/test_generic_processor.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/test_generic_processor.py	2011-10-06 09:10:34.352911664 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import time
 
diff -ur bzr-fastimport-0.11.0.orig/tests/test_revision_store.py bzr-fastimport-0.11.0/tests/test_revision_store.py
--- bzr-fastimport-0.11.0.orig/tests/test_revision_store.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/tests/test_revision_store.py	2011-10-06 09:07:13.496262300 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 """Direct tests of the revision_store classes."""
 
diff -ur bzr-fastimport-0.11.0.orig/user_mapper.py bzr-fastimport-0.11.0/user_mapper.py
--- bzr-fastimport-0.11.0.orig/user_mapper.py	2011-08-23 02:50:16.000000000 +1000
+++ bzr-fastimport-0.11.0/user_mapper.py	2011-10-06 09:10:34.354911710 +1000
@@ -11,8 +11,7 @@
 # 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, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 from email import Utils