2003-12-02 Richard Hult <richard@imendio.com>

	* Update AFL version to 2.0 throughout the source files to reflect
	the update that was done a while ago.

82 files changed, 82 insertions, 82 deletions

diff --git a/dbus/dbus-address.c b/dbus/dbus-address.c
index 97af49fd..f5cc56d2 100644
--- a/dbus/dbus-address.c
+++ b/dbus/dbus-address.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-address.h b/dbus/dbus-address.h
index eb5b66e3..497578f7 100644
--- a/dbus/dbus-address.h
+++ b/dbus/dbus-address.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-arch-deps.h.in b/dbus/dbus-arch-deps.h.in
index 92e68a75..9d0d597f 100644
--- a/dbus/dbus-arch-deps.h.in
+++ b/dbus/dbus-arch-deps.h.in
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-auth-script.c b/dbus/dbus-auth-script.c
index 37f88900..f3154c92 100644
--- a/dbus/dbus-auth-script.c
+++ b/dbus/dbus-auth-script.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-auth-script.h b/dbus/dbus-auth-script.h
index 8f561e68..799241d8 100644
--- a/dbus/dbus-auth-script.h
+++ b/dbus/dbus-auth-script.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-auth.c b/dbus/dbus-auth.c
index 7c7befb1..6d3dfcc9 100644
--- a/dbus/dbus-auth.c
+++ b/dbus/dbus-auth.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-auth.h b/dbus/dbus-auth.h
index 48221ea0..5678a8c9 100644
--- a/dbus/dbus-auth.h
+++ b/dbus/dbus-auth.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-bus.c b/dbus/dbus-bus.c
index 0777e746..ea6a8bb5 100644
--- a/dbus/dbus-bus.c
+++ b/dbus/dbus-bus.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-bus.h b/dbus/dbus-bus.h
index 072b0c8e..2bde290e 100644
--- a/dbus/dbus-bus.h
+++ b/dbus/dbus-bus.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index 6afd3301..b79aef78 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-connection.c b/dbus/dbus-connection.c
index 01ebeb1c..34e55873 100644
--- a/dbus/dbus-connection.c
+++ b/dbus/dbus-connection.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-connection.h b/dbus/dbus-connection.h
index c2251c86..0fe4eba2 100644
--- a/dbus/dbus-connection.h
+++ b/dbus/dbus-connection.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-dataslot.c b/dbus/dbus-dataslot.c
index defe9345..0f7b8c76 100644
--- a/dbus/dbus-dataslot.c
+++ b/dbus/dbus-dataslot.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-dataslot.h b/dbus/dbus-dataslot.h
index c4a914b4..86877af2 100644
--- a/dbus/dbus-dataslot.h
+++ b/dbus/dbus-dataslot.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-errors.c b/dbus/dbus-errors.c
index f7b2f740..07f42e3e 100644
--- a/dbus/dbus-errors.c
+++ b/dbus/dbus-errors.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2002  Red Hat Inc.
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-errors.h b/dbus/dbus-errors.h
index b7b601bf..9d201230 100644
--- a/dbus/dbus-errors.h
+++ b/dbus/dbus-errors.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2002  Red Hat Inc.
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-hash.c b/dbus/dbus-hash.c
index b0581510..aa03c59d 100644
--- a/dbus/dbus-hash.c
+++ b/dbus/dbus-hash.c
@@ -10,7 +10,7 @@
  * code from tclHash.c; the Tcl license follows this standad D-BUS
  * license information.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-hash.h b/dbus/dbus-hash.h
index 58fd5bf8..de6afec2 100644
--- a/dbus/dbus-hash.h
+++ b/dbus/dbus-hash.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-internals.c b/dbus/dbus-internals.c
index 803eac08..a7d6e21a 100644
--- a/dbus/dbus-internals.c
+++ b/dbus/dbus-internals.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-internals.h b/dbus/dbus-internals.h
index 675a3a73..264d5f7c 100644
--- a/dbus/dbus-internals.h
+++ b/dbus/dbus-internals.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-keyring.c b/dbus/dbus-keyring.c
index 99de65cf..68178b15 100644
--- a/dbus/dbus-keyring.c
+++ b/dbus/dbus-keyring.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-keyring.h b/dbus/dbus-keyring.h
index d4e2a57e..66cecf9e 100644
--- a/dbus/dbus-keyring.h
+++ b/dbus/dbus-keyring.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-list.c b/dbus/dbus-list.c
index 5d2bcd42..68f89f23 100644
--- a/dbus/dbus-list.c
+++ b/dbus/dbus-list.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-list.h b/dbus/dbus-list.h
index 7aa6c96c..2b4bc890 100644
--- a/dbus/dbus-list.h
+++ b/dbus/dbus-list.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-macros.h b/dbus/dbus-macros.h
index 8b341de7..a5f664c8 100644
--- a/dbus/dbus-macros.h
+++ b/dbus/dbus-macros.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-mainloop.c b/dbus/dbus-mainloop.c
index dd0c015c..a998ccea 100644
--- a/dbus/dbus-mainloop.c
+++ b/dbus/dbus-mainloop.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-mainloop.h b/dbus/dbus-mainloop.h
index fadc5ad9..61c06f65 100644
--- a/dbus/dbus-mainloop.h
+++ b/dbus/dbus-mainloop.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-marshal.c b/dbus/dbus-marshal.c
index 428e1fd2..9f92f91b 100644
--- a/dbus/dbus-marshal.c
+++ b/dbus/dbus-marshal.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2002 CodeFactory AB
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-marshal.h b/dbus/dbus-marshal.h
index 0e482c17..b1b8e2c9 100644
--- a/dbus/dbus-marshal.h
+++ b/dbus/dbus-marshal.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-md5.h b/dbus/dbus-md5.h
index e31711dd..079a6ba3 100644
--- a/dbus/dbus-md5.h
+++ b/dbus/dbus-md5.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  *
  * 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/dbus/dbus-memory.c b/dbus/dbus-memory.c
index cfe4dfaf..8ee65ee3 100644
--- a/dbus/dbus-memory.c
+++ b/dbus/dbus-memory.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-memory.h b/dbus/dbus-memory.h
index c0623c8d..d13ea6ea 100644
--- a/dbus/dbus-memory.h
+++ b/dbus/dbus-memory.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index a53a4886..25a7464d 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-mempool.h b/dbus/dbus-mempool.h
index 3c123915..5b2a29d4 100644
--- a/dbus/dbus-mempool.h
+++ b/dbus/dbus-mempool.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message-builder.c b/dbus/dbus-message-builder.c
index 9f68793d..ebe049d5 100644
--- a/dbus/dbus-message-builder.c
+++ b/dbus/dbus-message-builder.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message-builder.h b/dbus/dbus-message-builder.h
index 00a8e956..955dbb63 100644
--- a/dbus/dbus-message-builder.h
+++ b/dbus/dbus-message-builder.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message-handler.c b/dbus/dbus-message-handler.c
index 89f180a4..cd548076 100644
--- a/dbus/dbus-message-handler.c
+++ b/dbus/dbus-message-handler.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message-handler.h b/dbus/dbus-message-handler.h
index ab6f0508..9af8be33 100644
--- a/dbus/dbus-message-handler.h
+++ b/dbus/dbus-message-handler.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message-internal.h b/dbus/dbus-message-internal.h
index 26f1676b..5990b05c 100644
--- a/dbus/dbus-message-internal.h
+++ b/dbus/dbus-message-internal.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message.c b/dbus/dbus-message.c
index 2bf63a16..9b49ddba 100644
--- a/dbus/dbus-message.c
+++ b/dbus/dbus-message.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2002, 2003  Red Hat Inc.
  * Copyright (C) 2002, 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-message.h b/dbus/dbus-message.h
index 038fdc87..3655d2e4 100644
--- a/dbus/dbus-message.h
+++ b/dbus/dbus-message.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-object-tree.c b/dbus/dbus-object-tree.c
index 09049195..6856033a 100644
--- a/dbus/dbus-object-tree.c
+++ b/dbus/dbus-object-tree.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  *
  * 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/dbus/dbus-object-tree.h b/dbus/dbus-object-tree.h
index 09e4ee29..56b66ffb 100644
--- a/dbus/dbus-object-tree.h
+++ b/dbus/dbus-object-tree.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-pending-call.c b/dbus/dbus-pending-call.c
index a19ed8b9..e7173490 100644
--- a/dbus/dbus-pending-call.c
+++ b/dbus/dbus-pending-call.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  *
  * 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/dbus/dbus-pending-call.h b/dbus/dbus-pending-call.h
index 3ea1486e..5d9e8bc2 100644
--- a/dbus/dbus-pending-call.h
+++ b/dbus/dbus-pending-call.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-protocol.h b/dbus/dbus-protocol.h
index 6d0a83cd..f042f026 100644
--- a/dbus/dbus-protocol.h
+++ b/dbus/dbus-protocol.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-resources.c b/dbus/dbus-resources.c
index a5a8e099..0d78739c 100644
--- a/dbus/dbus-resources.c
+++ b/dbus/dbus-resources.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-resources.h b/dbus/dbus-resources.h
index 2975405a..77f31f3e 100644
--- a/dbus/dbus-resources.h
+++ b/dbus/dbus-resources.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server-debug-pipe.c b/dbus/dbus-server-debug-pipe.c
index 6a66391e..4340e154 100644
--- a/dbus/dbus-server-debug-pipe.c
+++ b/dbus/dbus-server-debug-pipe.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server-debug-pipe.h b/dbus/dbus-server-debug-pipe.h
index 76cb5d60..b7aaded4 100644
--- a/dbus/dbus-server-debug-pipe.h
+++ b/dbus/dbus-server-debug-pipe.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2003  CodeFactory AB
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h
index 317805f5..a1c5ab79 100644
--- a/dbus/dbus-server-protected.h
+++ b/dbus/dbus-server-protected.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server-unix.c b/dbus/dbus-server-unix.c
index 487d60ec..e0400290 100644
--- a/dbus/dbus-server-unix.c
+++ b/dbus/dbus-server-unix.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server-unix.h b/dbus/dbus-server-unix.h
index 95f0b756..c9aecd7d 100644
--- a/dbus/dbus-server-unix.h
+++ b/dbus/dbus-server-unix.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server.c b/dbus/dbus-server.c
index 2e33cac6..b97b1ca7 100644
--- a/dbus/dbus-server.c
+++ b/dbus/dbus-server.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-server.h b/dbus/dbus-server.h
index 237e9500..98b2a31b 100644
--- a/dbus/dbus-server.h
+++ b/dbus/dbus-server.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-sha.c b/dbus/dbus-sha.c
index a0918d69..54f851a9 100644
--- a/dbus/dbus-sha.c
+++ b/dbus/dbus-sha.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2003 Red Hat Inc.
  * Copyright (C) 1995 A. M. Kuchling
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  *
  * 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/dbus/dbus-sha.h b/dbus/dbus-sha.h
index 0a48d197..7d319d32 100644
--- a/dbus/dbus-sha.h
+++ b/dbus/dbus-sha.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  *
  * 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/dbus/dbus-spawn.c b/dbus/dbus-spawn.c
index 0e62f951..0d32d685 100644
--- a/dbus/dbus-spawn.c
+++ b/dbus/dbus-spawn.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-spawn.h b/dbus/dbus-spawn.h
index 9771144d..a392513d 100644
--- a/dbus/dbus-spawn.h
+++ b/dbus/dbus-spawn.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-string-private.h b/dbus/dbus-string-private.h
index a030674b..41a15665 100644
--- a/dbus/dbus-string-private.h
+++ b/dbus/dbus-string-private.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-string.c b/dbus/dbus-string.c
index 3a209a75..f78d01c9 100644
--- a/dbus/dbus-string.c
+++ b/dbus/dbus-string.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-string.h b/dbus/dbus-string.h
index 2441213c..00d12a3e 100644
--- a/dbus/dbus-string.h
+++ b/dbus/dbus-string.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2002, 2003 Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c
index 8e2a9071..2c108a58 100644
--- a/dbus/dbus-sysdeps.c
+++ b/dbus/dbus-sysdeps.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-sysdeps.h b/dbus/dbus-sysdeps.h
index 363f665d..da71f99f 100644
--- a/dbus/dbus-sysdeps.h
+++ b/dbus/dbus-sysdeps.h
@@ -4,7 +4,7 @@
  * Copyright (C) 2002, 2003  Red Hat, Inc.
  * Copyright (C) 2003 CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-test-main.c b/dbus/dbus-test-main.c
index 50a1c760..80e005ee 100644
--- a/dbus/dbus-test-main.c
+++ b/dbus/dbus-test-main.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-test.c b/dbus/dbus-test.c
index b7a09a0e..36482301 100644
--- a/dbus/dbus-test.c
+++ b/dbus/dbus-test.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-test.h b/dbus/dbus-test.h
index 02b2c279..cc75b721 100644
--- a/dbus/dbus-test.h
+++ b/dbus/dbus-test.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-threads.c b/dbus/dbus-threads.c
index 2170c465..bfb79008 100644
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003 Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-threads.h b/dbus/dbus-threads.h
index dea969a2..116cd2d8 100644
--- a/dbus/dbus-threads.h
+++ b/dbus/dbus-threads.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-timeout.c b/dbus/dbus-timeout.c
index bd740963..5655a054 100644
--- a/dbus/dbus-timeout.c
+++ b/dbus/dbus-timeout.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-timeout.h b/dbus/dbus-timeout.h
index 3950257c..f02ca834 100644
--- a/dbus/dbus-timeout.h
+++ b/dbus/dbus-timeout.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2003  CodeFactory AB
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-transport-protected.h b/dbus/dbus-transport-protected.h
index d4d20957..409e683b 100644
--- a/dbus/dbus-transport-protected.h
+++ b/dbus/dbus-transport-protected.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-transport-unix.c b/dbus/dbus-transport-unix.c
index 40c7a5df..1e99e9e0 100644
--- a/dbus/dbus-transport-unix.c
+++ b/dbus/dbus-transport-unix.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-transport-unix.h b/dbus/dbus-transport-unix.h
index 8d3f5b10..962178c7 100644
--- a/dbus/dbus-transport-unix.h
+++ b/dbus/dbus-transport-unix.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-transport.c b/dbus/dbus-transport.c
index 40fc98d0..a439a6e3 100644
--- a/dbus/dbus-transport.c
+++ b/dbus/dbus-transport.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-transport.h b/dbus/dbus-transport.h
index 6b1f4b76..a642b21a 100644
--- a/dbus/dbus-transport.h
+++ b/dbus/dbus-transport.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-types.h b/dbus/dbus-types.h
index 99cb45f5..4dcb7ec1 100644
--- a/dbus/dbus-types.h
+++ b/dbus/dbus-types.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-userdb.c b/dbus/dbus-userdb.c
index 13502306..4dc05b81 100644
--- a/dbus/dbus-userdb.c
+++ b/dbus/dbus-userdb.c
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-userdb.h b/dbus/dbus-userdb.h
index 90807478..693df07f 100644
--- a/dbus/dbus-userdb.h
+++ b/dbus/dbus-userdb.h
@@ -3,7 +3,7 @@
  * 
  * Copyright (C) 2003  Red Hat, Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-watch.c b/dbus/dbus-watch.c
index 7171dd6d..eb4aa8a0 100644
--- a/dbus/dbus-watch.c
+++ b/dbus/dbus-watch.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus-watch.h b/dbus/dbus-watch.h
index bea4d59f..18fe3932 100644
--- a/dbus/dbus-watch.h
+++ b/dbus/dbus-watch.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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/dbus/dbus.h b/dbus/dbus.h
index 99eee18c..8c42849a 100644
--- a/dbus/dbus.h
+++ b/dbus/dbus.h
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2002, 2003  Red Hat Inc.
  *
- * Licensed under the Academic Free License version 1.2
+ * Licensed under the Academic Free License version 2.0
  * 
  * 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