Merge from mainline.
commitd2d818bf00fa3a3204abd9b31103cfca21ff8125
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (15 22:35 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 16 May 2011 05:35:30 +0000 (15 22:35 -0700)
treedf846ff0c7db8606942243e10fb8792eaf7bba6b
parentef3ff03613106225ad047d1dd04219d460e897d9
parent1aba75c248ae6f38007c5808186f2e454ef3036d
Merge from mainline.