Fix regressions in patchfile after last patch, several other minor fixes.
tree497c439515dfe24ba1633b783e69f8acc80c563c
-rw-r--r-- 8837 .gitignore
-rw-r--r-- 35147 COPYING
-rw-r--r-- 1129 MAINTAINERS
-rw-r--r-- 2558 Manifest
-rw-r--r-- 188 PFIF.txt
-rw-r--r-- 8600 README
-rw-r--r-- 6487 README.Coding
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1087 Roadmap
-rw-r--r-- 1246 WHATSNEW.txt
-rw-r--r-- 5641 WHATSNEW4.txt
drwxr-xr-x - docs-xml
drwxr-xr-x - examples
-rw-r--r-- 5377 howto4.txt
drwxr-xr-x - lib
drwxr-xr-x - libcli
-rw-r--r-- 262 merged-branches.txt
drwxr-xr-x - packaging
drwxr-xr-x - packaging4
drwxr-xr-x - pcp
drwxr-xr-x - pidl
-rw-r--r-- 30940 prog_guide4.txt
drwxr-xr-x - release-scripts
drwxr-xr-x - source3
drwxr-xr-x - source4
drwxr-xr-x - swat
-rw-r--r-- 2478 swat2.txt
drwxr-xr-x - swat2
drwxr-xr-x - testdata
drwxr-xr-x - testprogs
drwxr-xr-x - testsuite