Merge to upstream revision 1142
tree4cd7b77902ba7a08e0c391c4eb0f6254987e50ec
-rw-r--r-- 1040 AUTHORS
-rw-r--r-- 12303 CHANGELOG
drwxr-xr-x - CVS
-rw-r--r-- 1569 LICENSE
-rw-r--r-- 8504 README
-rw-r--r-- 42 README.txt
-rw-r--r-- 397 build.properties.sample
-rw-r--r-- 9402 build.xml
drwxr-xr-x - docs
drwxr-xr-x - etc
drwxr-xr-x - lib
-rw-r--r-- 9142 pom.xml
drwxr-xr-x - source
drwxr-xr-x - src
drwxr-xr-x - test