Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 05:05:13 +0000 (22:05 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 26 Aug 2011 05:05:13 +0000 (22:05 -0700)
commitfcbc5f60ee9c1ed2fb8b8b4f36b8a0658250a1bd
treee11dce4bf08f4da72eb29735384abd0ce83f0598
parentef25feb44365ed60211bc0b965e421b58b3dc075
parent16e07ee0c37e8487937e3709c23a116119926b2b
Merge from trunk.