merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Wed, 25 Feb 2009 20:27:05 +0000 (12:27 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Wed, 25 Feb 2009 20:27:05 +0000 (12:27 -0800)

Trivial merge