Merge branch 'docs'
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Apr 2011 00:18:02 +0000 (17:18 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Apr 2011 00:18:02 +0000 (17:18 -0700)

Trivial merge