merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 22 Oct 2009 04:25:36 +0000 (21:25 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 22 Oct 2009 04:25:36 +0000 (21:25 -0700)

Trivial merge