Pull misc into release branch
authorLen Brown <[email protected]>
Mon, 17 Sep 2007 04:28:58 +0000 (00:28 -0400)
committerLen Brown <[email protected]>
Mon, 17 Sep 2007 04:28:58 +0000 (00:28 -0400)

Trivial merge