tree 648bc437ca5562bc7c67224ad71ef90dfacc12d1
parent 2309d726b7b0c37dbd9c57c653e2053ec6258ac8
author David Schleef <ds@schleef.org> 1072057629 +0000
committer David Schleef <ds@schleef.org> 1072057629 +0000

Merge CAPS branch

Original commit message from CVS:
Merge CAPS branch