merge from 2.2
tree5b706eebeabb6ba8871ceb64c7b1fadd5dbd1412
-rw-r--r-- 17982 COPYING
-rw-r--r-- 3311 Manifest
-rw-r--r-- 6569 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1891 Roadmap
-rw-r--r-- 15568 WHATSNEW.txt
drwxr-xr-x - docs
drwxr-xr-x - examples
drwxr-xr-x - packaging
drwxr-xr-x - pcp
drwxr-xr-x - source
drwxr-xr-x - swat
drwxr-xr-x - testsuite