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)
commit18c69b1cd9a9e00aa99beee42fa6c5aef3c576ca
tree20df1bb4f81e2608a9cd52eedf10610ab4f6c98c
parent56d9591aef916be34b4e20dc70f5b439a8a937f3
parent8ff1807d8f8012dc4b8f995986f7de8a56a202a8
Merge branch 'release'