Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 14 Jun 2011 00:58:31 +0000 (17:58 -0700)
commit3c3a05dfb70656c56f60666a8c32a28d85f072fb
treef8e2901e63318bf0cd7299f54f4901ea11b9eeb5
parenta690a978ec42934c3f9d29c15cddd0240ab7a009
parentd647b7c44e4205c50b29d1533880e9ae7ce0bea6
Merge from trunk.