Merge from trunk.
commit8eeb28635aafbbba375bc54cbccba2137d5a7aa2
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (11 14:32 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 11 Jun 2011 21:32:21 +0000 (11 14:32 -0700)
tree510f7688dd8e049549c9eeaf56dfc622f007cbc3
parent4475bec4dd51b8da9884816d9ca06e4d60a35e15
parentdef722bf0990b94cebf4c0761cd99dc3c0de6471
Merge from trunk.