Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:14:53 +0000 (09:14 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 16:14:53 +0000 (09:14 -0700)
commit2f241ea5576dd3c6ad54b8c14828c8e934fa34a9
tree8b27624f9c0504f7a5d390662c2fd8787f54d9ce
parenta63df9262e1406cd6bd399c29107758f22a7d149
parentec9da8404b5f400bd4a09d16490de69d4983bf52
Merge from trunk.