Merge in the developer string options from HEAD. We need to ensure 3.0
-rw-r--r-- 11 .cvsignore
-rw-r--r-- 17982 COPYING
-rw-r--r-- 3311 Manifest
-rw-r--r-- 8274 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1891 Roadmap
-rw-r--r-- 17741 WHATSNEW.txt
drwxr-xr-x - docs
drwxr-xr-x - examples
drwxr-xr-x - packaging
drwxr-xr-x - pcp
drwxr-xr-x - source3
drwxr-xr-x - swat
drwxr-xr-x - testsuite