merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Mon, 13 Dec 2010 20:36:08 +0000 (12:36 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Mon, 13 Dec 2010 20:36:08 +0000 (12:36 -0800)

Trivial merge