Merge from mainline.
commite7fb066b4d6855c18940a99f2fa8a8ea49ec7f59
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (19 15:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (19 15:58 -0800)
treedd10a3acd5ac32c02b1ac8e7fa28b13a9adce367
parentfde72d2eca3d4e5076df74b131632812e6d2e0c4
parent6489783e34771b40dbd182f783bfa545c1f93367
Merge from mainline.