Merge branch 'master' of http://www.physics.drexel.edu/~wking/code/git/be
authorChris Ball <cjb@laptop.org>
Fri, 22 Oct 2010 03:04:52 +0000 (23:04 -0400)
committerChris Ball <cjb@laptop.org>
Fri, 22 Oct 2010 03:04:52 +0000 (23:04 -0400)

Trivial merge