Merge branch 'release'
authorRobert Bradshaw <robertwb@math.washington.edu>
Fri, 28 Jan 2011 10:42:29 +0000 (02:42 -0800)
committerRobert Bradshaw <robertwb@math.washington.edu>
Fri, 28 Jan 2011 10:42:29 +0000 (02:42 -0800)

Trivial merge