Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 25 May 2012 20:31:25 +0000 (13:31 -0700)
commit8825930890470898883be9841d6a0aa3d6ff6623
treeb251b3c3739199b1d195fe0748415d51c3a9489b
parent024811862b8929f91fcaac280eaac8dd8719e7e1
parent87eb79c25b2f7fff7937198989b7666cbbe83963
Merge from trunk.