r6371: fix botched merge of conflicte file
tree93149132d4812aa0ebac1542f9cda9e5e2b31e21
-rw-r--r-- 17982 COPYING
-rw-r--r-- 2583 Manifest
-rw-r--r-- 8589 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1104 Roadmap
-rw-r--r-- 168118 WHATSNEW.txt
drwxr-xr-x - examples
drwxr-xr-x - packaging
drwxr-xr-x - pcp
drwxr-xr-x - source
drwxr-xr-x - swat
drwxr-xr-x - testsuite