merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 12 Nov 2010 09:43:14 +0000 (01:43 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 12 Nov 2010 09:43:14 +0000 (01:43 -0800)

Trivial merge