Merge #11131

author Mark Dickinson <mdickinson@enthought.com>

Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)

committer Mark Dickinson <mdickinson@enthought.com>

Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)
author Mark Dickinson <mdickinson@enthought.com>
Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)
committer Mark Dickinson <mdickinson@enthought.com>
Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)
diff --cc Lib/decimal.py
Simple merge
diff --cc Misc/NEWS
Simple merge
author	Mark Dickinson <mdickinson@enthought.com>
	Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)
committer	Mark Dickinson <mdickinson@enthought.com>
	Sat, 12 Mar 2011 11:17:26 +0000 (11:17 +0000)
		1	2
Lib/decimal.py	patch \|	diff1 \|	diff2 \|	blob \| history
Misc/NEWS	patch \|	diff1 \|	diff2 \|	blob \| history