Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 13 Mar 2011 17:28:15 +0000 (10:28 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 13 Mar 2011 17:28:15 +0000 (10:28 -0700)
commit3eca4629203c3038f04db312999ca32d8e292e50
tree7dab20a2f6de3e300fd266f51b71efd1d9f52188
parent01e0b5adf4e35c2b00705c212b853936fe218cac
parentd32df629a23d0e04eb70df9c6e60e821d905c822
Merge from mainline.
src/ChangeLog