From: W. Trevor King <wking@drexel.edu>
Date: Thu, 13 Nov 2008 18:47:33 +0000 (-0500)
Subject: Merge from main branch
X-Git-Tag: 1.0.0~152^2~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fadd581e22a6614ec7d2815300aa0585a27f7c18;p=be.git

Merge from main branch
---

fadd581e22a6614ec7d2815300aa0585a27f7c18