Merge branches 'release' and 'doc' into release
Len Brown [Thu, 13 Mar 2008 05:59:53 +0000 (01:59 -0400)]

Trivial merge