Pull trivial into release branch

This commit is contained in:
Len Brown 2006-06-29 15:57:42 -04:00
commit a51a69c0ed