merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 20 Feb 2009 23:05:38 +0000 (15:05 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 20 Feb 2009 23:05:38 +0000 (15:05 -0800)

Trivial merge