Merge from trunk.
commitde677ace77fa48962be80b668662a7009498e5d6
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 16:12:16 +0000 (30 09:12 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 30 May 2011 16:12:16 +0000 (30 09:12 -0700)
treeb596bc66c98f21f39fcf11b676c974161ba94f4e
parent703f86387fd680855fce275bc87a524ac8d746bf
parent3687c2efb7e7a5b6afbf87588a248431ccc8dd65
Merge from trunk.
src/ChangeLog