From: smbaker <smbaker@fc8clean.lan>
Date: Mon, 28 Nov 2011 03:06:16 +0000 (-0800)
Subject: fix merge problem
X-Git-Tag: sfa-2.0-1~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=037578a7bee4db0bacb84f728db6bf2735bf9e33

fix merge problem
---

037578a7bee4db0bacb84f728db6bf2735bf9e33
diff --cc sfa/client/sfi.py
index 64bc550b,6299ce2b..6299ce2b
mode 100755,100755..100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py