Commit 610ca128a2e9199fcb4ae780dac2f7b34a65a4a6

Paul Eggert 2011-10-27T12:43:51

Adjust to Bruno's comments.