Merge from mainline.
commita56a74520b8ddd6c6c3a122a068c57a5803fdbd1
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 02:18:44 +0000 (31 18:18 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 1 Feb 2011 02:18:44 +0000 (31 18:18 -0800)
treed50f4de19f6bdad0dfd6e404fdec0bdad429045b
parent002b11319bec4c5cb93f5a7d2c0fdbc6e62e7c3a
parent7beca58d7c7466ee4163693c0a1f940f6b68b926
Merge from mainline.