merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sat, 17 Jan 2009 21:30:38 +0000 (13:30 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sat, 17 Jan 2009 21:30:38 +0000 (13:30 -0800)

Trivial merge