Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be
authorChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 17:44:38 +0000 (13:44 -0400)
committerChris Ball <cjb@laptop.org>
Fri, 25 Jun 2010 17:44:38 +0000 (13:44 -0400)

Trivial merge