Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Sep 2011 17:44:37 +0000 (10:44 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 30 Sep 2011 17:44:37 +0000 (10:44 -0700)
commit535272bb73eff5a5db01301e5b60f6128d6dc788
treeb41937c81a61bf737ef15efb434fc06338da25b4
parent38532ce6ecb33efee5f697886d9fd20a3c2cda01
parentf701dc2abbcfb64c0c4d02ac899dccb03ee2b246
Merge from trunk.
src/ChangeLog
src/alloc.c
src/charset.c
src/sysdep.c