merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Tue, 15 Sep 2009 01:56:23 +0000 (18:56 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Tue, 15 Sep 2009 01:56:23 +0000 (18:56 -0700)

Trivial merge