Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (15:58 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Jan 2011 23:58:00 +0000 (15:58 -0800)
commit38ec24bf555387224ba36a7ead82d6e4d89018ed
treeed9a1478d3050f006639ba2bb329d7ff69e43b49
parent0813c96eb2f6af9d6a392243b0d669d38467f23c
parente1ef0dac0866570df62f96fb004de896f6e82397
Merge from mainline.