From 9585cccde553d69ead161f7083cedcb0b323b596 Mon Sep 17 00:00:00 2001
From: Morgan Collett <morgan.collett@gmail.com>
Date: Wed, 26 Mar 2008 10:27:02 +0000
Subject: Merge branch 'master' into update-1 to sync it with Update.1 version released off master

---
(limited to 'AUTHORS')

diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000..0ba414b
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,8 @@
+Justin Gallardo <justin.gallardo@gmail.com>
+Marco Pesenti Gritti <mpg@redhat.com>
+Dafydd Harries <daf@rhydd.org>
+Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Morgan Collett <morgan.collett@gmail.com>
+Dan Winship <dwinship@redhat.com>
+Simon Schampijer <simon@schampijer.de>
+C. Scott Ananian <cscott@laptop.org>
--
cgit v0.9.1