From: W. Trevor King <wking@drexel.edu>
Date: Fri, 19 Jun 2009 15:09:03 +0000 (-0400)
Subject: Merge from main branch.
X-Git-Tag: 1.0.0~86
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=609333cf592ecc188a92295f8d582350db9a0d8e;p=be.git

Merge from main branch.
---

609333cf592ecc188a92295f8d582350db9a0d8e