Merge
authorVictor Stinner <victor.stinner@haypocalc.com>
Sat, 17 Dec 2011 21:40:19 +0000 (22:40 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Sat, 17 Dec 2011 21:40:19 +0000 (22:40 +0100)
commitbb305de584414f082afc1cbc2cd61160ef46d88a
treedbda3f68e55d0fc437c971c6cbe2d379166f28c5
parentab870218e341724aaf983df9e6e7a425edcbd88b
parente85488c6f4d01ad53e0836e90fcd6095d0a7a987
Merge