merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Mon, 23 Nov 2009 19:16:14 +0000 (11:16 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Mon, 23 Nov 2009 19:16:14 +0000 (11:16 -0800)

Trivial merge