merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 10 Dec 2010 06:50:16 +0000 (22:50 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 10 Dec 2010 06:50:16 +0000 (22:50 -0800)

Trivial merge