From: W. Trevor King <wking@drexel.edu>
Date: Thu, 8 Sep 2011 03:15:25 +0000 (-0400)
Subject: Merge remote branch 'tanguy/master'
X-Git-Tag: 1.1.0~175^2~9
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=49af3ec57ce56256ef306f1a51e14812a4c6a799;p=be.git

Merge remote branch 'tanguy/master'
---

49af3ec57ce56256ef306f1a51e14812a4c6a799