merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 9 Dec 2010 11:13:56 +0000 (03:13 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 9 Dec 2010 11:13:56 +0000 (03:13 -0800)

Trivial merge