Merged some new bugs and be-xml-to-mbox extra_strings fix
authorW. Trevor King <wking@drexel.edu>
Fri, 29 Jan 2010 11:59:49 +0000 (06:59 -0500)
committerW. Trevor King <wking@drexel.edu>
Fri, 29 Jan 2010 11:59:49 +0000 (06:59 -0500)

Trivial merge