Merge from trunk.
commit7ab3acf4ad7166a3ae8998a8a43ad59f852879ea
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (4 12:06 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 4 Sep 2011 19:06:14 +0000 (4 12:06 -0700)
treec9a6695284780c252080d954569a5481498f7d57
parent806add1d2f7810f51a2e1c9a6e107413815f13cd
parentf5e29b9b70a5b6493d13c912e27ecf3bffc97716
Merge from trunk.