Merge from 3.3.

author Stefan Krah <skrah@bytereef.org>

Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)

committer Stefan Krah <skrah@bytereef.org>

Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)
author Stefan Krah <skrah@bytereef.org>
Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)
committer Stefan Krah <skrah@bytereef.org>
Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)
diff --cc Lib/decimal.py
Simple merge
diff --cc Lib/test/test_decimal.py
Simple merge
diff --cc setup.py
Simple merge
author	Stefan Krah <skrah@bytereef.org>
	Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)
committer	Stefan Krah <skrah@bytereef.org>
	Sun, 24 Nov 2013 18:56:23 +0000 (19:56 +0100)
		1	2
Lib/decimal.py	patch \|	diff1 \|	diff2 \|	blob \| history
Lib/test/test_decimal.py	patch \|	diff1 \|	diff2 \|	blob \| history
setup.py	patch \|	diff1 \|	diff2 \|	blob \| history