Merged revisions 83508-83509 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/release27-maint

................
  r83508 | r.david.murray | 2010-08-01 19:52:42 -0400 (Sun, 01 Aug 2010) | 9 lines

  Merged revisions 83506 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/branches/py3k

  ........
    r83506 | r.david.murray | 2010-08-01 19:43:28 -0400 (Sun, 01 Aug 2010) | 2 lines

    Fix ACKS alphabetization.
  ........
................
  r83509 | r.david.murray | 2010-08-01 19:53:40 -0400 (Sun, 01 Aug 2010) | 2 lines

  Fix the alphabetization fix (bad merge).
................

diff --git a/Misc/ACKS b/Misc/ACKS
index dd86e5c070d3291e2e7f4be791cb1c64d8e90f6e..757bc1d90d2190624f3721a5f0ceb388d93adc62 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -170,8 +170,8 @@ Vincent Delft
 Arnaud Delobelle
 Erik Demaine
 Roger Dev
-Catherine Devlin
 Raghuram Devarakonda
+Catherine Devlin
 Scott Dial
 Toby Dickenson
 Mark Dickinson