merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Aug 2008 08:53:51 +0000 (01:53 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 8 Aug 2008 08:53:51 +0000 (01:53 -0700)

Trivial merge