merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 22 Nov 2009 00:27:12 +0000 (16:27 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 22 Nov 2009 00:27:12 +0000 (16:27 -0800)

Trivial merge