merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 9 Nov 2008 02:05:10 +0000 (18:05 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 9 Nov 2008 02:05:10 +0000 (18:05 -0800)

Trivial merge