Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be
authorChris Ball <cjb@laptop.org>
Sun, 31 Oct 2010 10:30:26 +0000 (06:30 -0400)
committerChris Ball <cjb@laptop.org>
Sun, 31 Oct 2010 10:30:26 +0000 (06:30 -0400)

Trivial merge