Merge remote branch 'borg/master'
authorW. Trevor King <wking@drexel.edu>
Fri, 12 Nov 2010 17:40:38 +0000 (12:40 -0500)
committerW. Trevor King <wking@drexel.edu>
Fri, 12 Nov 2010 17:40:38 +0000 (12:40 -0500)

Trivial merge