From: W. Trevor King <wking@drexel.edu>
Date: Thu, 8 Sep 2011 02:33:51 +0000 (-0400)
Subject: Merge remote branch 'pschumms/master'
X-Git-Tag: 1.1.0~175^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b004702a025814290d10403e0de0c296617ebf68;p=be.git

Merge remote branch 'pschumms/master'
---

b004702a025814290d10403e0de0c296617ebf68