[1.0.X] Updated svnmerge metadata and added myself to committers (r9416 from trunk).

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@9417 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 12 insertions, 2 deletions

diff --git a/AUTHORS b/AUTHORS
index 146cd1d368..43845c577a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Robert Wittams
     * Gary Wilson
     * Brian Rosner
+    * Karen Tracey
 
 More information on the main contributors to Django can be found in
 docs/internals/committers.txt.
@@ -394,7 +395,6 @@ answer newbie questions, and generally made Django that much better:
     Tom Tobin
     Joe Topjian <http://joe.terrarum.net/geek/code/python/django/>
     torne-django@wolfpuppy.org.uk
-    Karen Tracey <graybark@bellsouth.net>
     Jeff Triplett <jeff.triplett@gmail.com>
     tstromberg@google.com
     Makoto Tsuyuki <mtsuyuki@gmail.com>
diff --git a/docs/internals/committers.txt b/docs/internals/committers.txt
index 3f4b404fe5..3ea3668d86 100644
--- a/docs/internals/committers.txt
+++ b/docs/internals/committers.txt
@@ -151,7 +151,17 @@ Gary Wilson
     In early 2007, Gary started contributing a lot of cleanup fixes and fixing
     broken windows. He's continued to do that necessary tidying up work
     throughout the code base since then.
-    
+
+Karen Tracey
+    Karen has a background in distributed operating systems (graduate school),
+    communications software (industry) and crossword puzzle construction 
+    (freelance).  The last of these brought her to Django, in late 2006, when
+    she set out to put a web front-end on her crossword puzzle database.  
+    That done, she stuck around in the community answering questions, debugging
+    problems, etc. -- because coding puzzles are as much fun as word puzzles.
+
+    Karen lives in Apex, NC, USA.
+
 Specialists
 -----------