Fix merge
tree9935246e660af19f8aa173e15847bd4ff0c4416d
-rw-r--r-- 43 .gitignore
-rw-r--r-- 89773 ChangeLog
-rw-r--r-- 9038 ChangeLog.old
-rw-r--r-- 197 DEBUG
-rw-r--r-- 1187 INSTALL
-rw-r--r-- 17987 LICENSE
-rw-r--r-- 1270 README
drwxr-xr-x - conf
-rwxr-xr-x 14183 configure
drwxr-xr-x - htdocs
drwxr-xr-x - lang
-rw-r--r-- 1688 monkey.spec
drwxr-xr-x - palm
drwxr-xr-x - plugins
drwxr-xr-x - qa
drwxr-xr-x - src