Pull misc into release branch
authorLen Brown <[email protected]>
Sat, 25 Aug 2007 05:40:27 +0000 (01:40 -0400)
committerLen Brown <[email protected]>
Sat, 25 Aug 2007 05:40:27 +0000 (01:40 -0400)

Trivial merge