merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Dec 2010 19:17:20 +0000 (11:17 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Tue, 14 Dec 2010 19:17:20 +0000 (11:17 -0800)

Trivial merge