Merge branch 'andyd' into blead
authorAndy Dougherty <doughera@lafayette.edu>
Wed, 23 Mar 2011 03:27:33 +0000 (23:27 -0400)
committerAndy Dougherty <doughera@lafayette.edu>
Wed, 23 Mar 2011 03:27:33 +0000 (23:27 -0400)

Trivial merge