merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Wed, 11 Jun 2008 20:16:06 +0000 (13:16 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Wed, 11 Jun 2008 20:16:06 +0000 (13:16 -0700)

Trivial merge