Merge from trunk.
commit9f0b1513ad9b24e2f7dec87d3afb32cd6240ccad
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (22 09:25 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 16:25:06 +0000 (22 09:25 -0700)
tree55150c011230521ce991f0c4ff36d2be4f6742f8
parente92b6c884116d70e224e9cb535ed85a2b05665a5
parent31fd4b3280acee4030efde84a0e23ae2b006ee31
Merge from trunk.