merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sat, 15 May 2010 20:50:21 +0000 (13:50 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sat, 15 May 2010 20:50:21 +0000 (13:50 -0700)

Trivial merge