merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 5 Nov 2010 08:46:49 +0000 (01:46 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 5 Nov 2010 08:46:49 +0000 (01:46 -0700)

Trivial merge