Fix merge conflict. Double free.0.6.1
tree421634af16c99566044e6869dc6a56dfe4c894af
-rw-r--r-- 117 AUTHORS
-rw-r--r-- 18002 COPYING
-rw-r--r-- 0 ChangeLog
-rw-r--r-- 9416 INSTALL
-rw-r--r-- 100 Makefile.am
-rw-r--r-- 0 NEWS
-rw-r--r-- 152 README
-rwxr-xr-x 170 bootstrap.sh
-rw-r--r-- 928 configure.in
drwxr-xr-x - include
drwxr-xr-x - src
drwxr-xr-x - test