Merge from trunk.
commit4847e3f0a94e3f24b40b060af528cf4b51d788c5
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (16 14:19 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 16 Jun 2011 21:19:55 +0000 (16 14:19 -0700)
treef5ceb65d02330ad2025cba4349165cdfe2124143
parent1c8e352f7e4291ab523996e7c5feaedfe0f4b350
parent0cca0a78a4ee6b761c2fd91ee5a6628f23e3368c
Merge from trunk.