merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 12 Aug 2010 18:53:20 +0000 (11:53 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 12 Aug 2010 18:53:20 +0000 (11:53 -0700)

Trivial merge