Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be
authorChris Ball <cjb@laptop.org>
Thu, 24 Jun 2010 23:05:30 +0000 (19:05 -0400)
committerChris Ball <cjb@laptop.org>
Thu, 24 Jun 2010 23:05:30 +0000 (19:05 -0400)

Trivial merge