merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Wed, 11 Nov 2009 20:46:43 +0000 (12:46 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Wed, 11 Nov 2009 20:46:43 +0000 (12:46 -0800)

Trivial merge