Merge branch 'docs' into blead
brian d foy [Thu, 24 Sep 2009 22:06:25 +0000 (17:06 -0500)]

Trivial merge