Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 05:52:31 +0000 (22:52 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 26 Sep 2011 05:52:31 +0000 (22:52 -0700)
commit8de9005d3cc8c605efa5a1eb9bef728a09dbde24
tree5b2551e7f2c7cd5bd2b3bdd31086ea2ad1ecdb3d
parent856bbc8152110a354293411eac5c629da9f4f74f
parentab22a8a19695ddbb5c5d08cfe4f60e7202072d82
Merge from trunk.