Merge from mainline.
commit384c8efec1d1da0937177fb391b5c2c97fe8704a
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 08:16:25 +0000 (31 00:16 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 31 Jan 2011 08:16:25 +0000 (31 00:16 -0800)
tree264682f2358af1dba1b9ad6a02198dfc738c6145
parent4a160d375716774296b9085edf91cf34b6ea2ac3
parent01c43b86dbbd5d5dfc64cd8ebc106777cf881401
Merge from mainline.