Merge from trunk.
commitd231e1987e31c9481489ee90db89b7b055ab3fb9
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 18:18:38 +0000 (22 11:18 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 22 Jun 2011 18:18:38 +0000 (22 11:18 -0700)
tree78e465eeae7c4ad9d5bc00a58c8b51a3041e3349
parent85fece3ec2ac88faec0ae3da5417d6e60b10cc63
parent1c0f1a199ca0114d8fa486a1a0df430677b91d5c
Merge from trunk.