merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Dec 2010 07:18:02 +0000 (23:18 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Dec 2010 07:18:02 +0000 (23:18 -0800)

Trivial merge