merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 11 Mar 2010 22:06:32 +0000 (14:06 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 11 Mar 2010 22:06:32 +0000 (14:06 -0800)

Trivial merge