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

Trivial merge