merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 22 Oct 2009 06:20:22 +0000 (23:20 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 22 Oct 2009 06:20:22 +0000 (23:20 -0700)

Trivial merge