merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sat, 7 Feb 2009 00:26:27 +0000 (16:26 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sat, 7 Feb 2009 00:26:27 +0000 (16:26 -0800)

Trivial merge