Merge http://www.physics.drexel.edu/~wking/code/git/be
authorChris Ball <cjb@laptop.org>
Mon, 2 Jan 2012 20:43:30 +0000 (15:43 -0500)
committerChris Ball <cjb@laptop.org>
Mon, 2 Jan 2012 20:43:30 +0000 (15:43 -0500)

Trivial merge