Merge branch 'release2'
authorRobert Bradshaw <robertwb@math.washington.edu>
Sun, 30 Jan 2011 11:04:00 +0000 (03:04 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Sun, 30 Jan 2011 11:04:00 +0000 (03:04 -0800)

Trivial merge