merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sat, 16 Aug 2008 20:27:23 +0000 (13:27 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sat, 16 Aug 2008 20:27:23 +0000 (13:27 -0700)

Trivial merge