Merge from trunk.
commitfd09688b0bbd5ee8011e78a1f4e794603e27232f
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:51:44 +0000 (1 07:51 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 1 Sep 2011 14:51:44 +0000 (1 07:51 -0700)
treebd29344a1c036161a15e27574c3db42797cdbd33
parent8666506ecd6b1a90c7c66fb4b6051e90fba20c30
parent6ed17f119f52dee3199a3efbdf8a92b93f5f8fd0
Merge from trunk.