Merged revisions 78217-78218 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r78217 | mark.dickinson | 2010-02-18 14:27:02 +0000 (Thu, 18 Feb 2010) | 5 lines

  Issue #7633: Context method in the decimal module (with the exception
  of the 'canonical' and 'is_canonical' methods) now consistently accept
  integer arguments wherever a Decimal instance is accepted.  Thanks
  Juan José Conti for the patch.
........
  r78218 | mark.dickinson | 2010-02-18 14:45:33 +0000 (Thu, 18 Feb 2010) | 1 line

  Doctest fixes for decimal.py:  add an integer-argument doctest for logical_invert;  don't use integer literals with a leading zero.
........
diff --git a/Misc/ACKS b/Misc/ACKS
index 847d1d1..94e22b3 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -150,6 +150,7 @@
 Jeffery Collins
 Robert Collins
 Paul Colomiets
+Juan José Conti
 Matt Conway
 David M. Cooke
 Greg Copeland