Merge from mainline.
commit51266f0bd922c9f22af6cbbd5ac5eb159caeda96
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Jan 2011 01:58:11 +0000 (25 17:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 26 Jan 2011 01:58:11 +0000 (25 17:58 -0800)
treec12233332e18d1ceb2e8cebaa140077ed8b9c6bf
parent8d38eb490bdd94432de803575ac3663cef360285
parent796e0e51fcc70bd6599ab1e8c12da12d90b323d7
Merge from mainline.