merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Wed, 28 Oct 2009 09:51:14 +0000 (02:51 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Wed, 28 Oct 2009 09:51:14 +0000 (02:51 -0700)

Trivial merge