merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Mon, 13 Dec 2010 21:39:16 +0000 (13:39 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Mon, 13 Dec 2010 21:39:16 +0000 (13:39 -0800)

Trivial merge