tree 7b3044f3f6d5634f0b77b39575c4cb97f811fdac
parent e30d492ac1aeb3d3545f7d49af20c8239b304b88
author Mike Bayer <mike_mp@zzzcomputing.com> 1326839922 -0500
committer Mike Bayer <mike_mp@zzzcomputing.com> 1326839922 -0500

merge 4be2ca3ed8be8e48795f351bb47ad51c9ca1a555 from head, docs update