merge
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 5 Dec 2010 10:24:17 +0000 (02:24 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 5 Dec 2010 10:24:17 +0000 (02:24 -0800)

Trivial merge