From: root <root@cassidy.cs.princeton.edu>
Date: Thu, 2 Dec 2010 16:47:29 +0000 (-0500)
Subject: Merge commit 'origin/master'
X-Git-Tag: sfa-1.0-9~6
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8e2d56a95af339b291a4a79c13009606e22120d0;p=sfa.git

Merge commit 'origin/master'
---

8e2d56a95af339b291a4a79c13009606e22120d0