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

Trivial merge