Merge the fix from head about short variables.
tree33865cb54c7212490be28042cf265def62fddd9b
-rw-r--r-- 11 .cvsignore
-rw-r--r-- 17982 COPYING
-rw-r--r-- 3311 Manifest
-rw-r--r-- 6579 README
-rw-r--r-- 0 Read-Manifest-Now
-rw-r--r-- 1891 Roadmap
-rw-r--r-- 17375 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