r21622: Fix bad merge caught by James.
tree7a7cc151512c32a4e0d849c657d8810c12a9ff46
-rw-r--r-- 17982 COPYING
-rw-r--r-- 1143 MAINTAINERS
-rw-r--r-- 2558 Manifest
-rw-r--r-- 8577 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1357 Roadmap
-rw-r--r-- 295579 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