Merge from vendor branch CVS:
authorJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sat, 18 Dec 2004 21:54:14 +0000 (21:54 +0000)
committerJeroen Ruigrok/asmodai <asmodai@dragonflybsd.org>
Sat, 18 Dec 2004 21:54:14 +0000 (21:54 +0000)
Add CVS 1.12.11.

Most notable features:

- new scripting hooks
- speed improvements
- write proxy support
- error message improvements
- various bug and documentation fixes


Trivial merge