Merge heads
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 19 Dec 2013 15:41:22 +0000 (16:41 +0100)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 19 Dec 2013 15:41:22 +0000 (16:41 +0100)

Trivial merge