r2124: merge from trunk (-r 2123):
tree3f1d8e19af0f437f01d0d324838d38b2e0b32633
-rw-r--r-- 17982 COPYING
drwxr-xr-x - packaging
-rw-r--r-- 32383 prog_guide.txt
drwxr-xr-x - source4
-rw-r--r-- 2478 swat2.txt