merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Tue, 23 Sep 2008 20:55:49 +0000 (13:55 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Tue, 23 Sep 2008 20:55:49 +0000 (13:55 -0700)

Trivial merge