Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 9 Jul 2012 04:56:32 +0000 (21:56 -0700)
commit8d16df0eec002109fd5373ea870504f3632219c7
tree89f82c196c351ba32dfe6fae470519afe62f3b1e
parentc4444d16dcc6b1cf2ac9e2c0bb20e3f5a54bdea1
parent65e4651590d48fc135a317538c904e3c68218cec
Merge from trunk.