merge from 2.2
tree600abcba832d054e89398d2b2bc17a4a7778d70e
-rw-r--r-- 17982 COPYING
-rw-r--r-- 4551 Manifest
-rw-r--r-- 6554 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1894 Roadmap
-rw-r--r-- 24583 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