Merge branch 'misc' into release
Len Brown [Thu, 15 Oct 2009 04:47:13 +0000 (00:47 -0400)]

Trivial merge