Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 3 Sep 2011 05:23:56 +0000 (22:23 -0700)
commit7365023b449c0dcb5eca6afc64b2feb5e578f6a0
tree98b2447a5ded71a68db057d28465c45e72c1e880
parent728f8f0a00a22e544789952c76f9eac0c3f8b2c6
parent3d03de90fb6e847d1d395dfdfdde85cf8f70f148
Merge from trunk.