Merge remote branch 'borg/master'
authorW. Trevor King <wking@drexel.edu>
Wed, 27 Oct 2010 19:19:35 +0000 (15:19 -0400)
committerW. Trevor King <wking@drexel.edu>
Wed, 27 Oct 2010 19:19:35 +0000 (15:19 -0400)

Trivial merge