Merge from mainline.
commita2f4f3269a20d855a271687d83ea1a3ac0d060f2
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 01:09:09 +0000 (22 17:09 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 23 Jan 2011 01:09:09 +0000 (22 17:09 -0800)
treef94a9c6ca5e0e7b189208bc8ceb29d57dfaf3aa6
parent0827ba94ad9cd3c63f30e0c98cb009a05f0b44c8
parent58692c156cda8fe18fe731f1f539d4d3545c5117
Merge from mainline.