merge main branch to devel
authorRobert Bradshaw <robertwb@math.washington.edu>
Thu, 6 Aug 2009 04:40:50 +0000 (21:40 -0700)
committerRobert Bradshaw <robertwb@math.washington.edu>
Thu, 6 Aug 2009 04:40:50 +0000 (21:40 -0700)

Trivial merge