fix merge problem
authorsmbaker <smbaker@fc8clean.lan>
Mon, 28 Nov 2011 03:06:16 +0000 (19:06 -0800)
committersmbaker <smbaker@fc8clean.lan>
Mon, 28 Nov 2011 03:06:16 +0000 (19:06 -0800)
commit037578a7bee4db0bacb84f728db6bf2735bf9e33
tree1bbf9873a3a8c1b29c189ceefe320df2b11b6650
parent1a4812982ba0979c9cb2ce0b0e6275b910befb4b
parentf218f2df404440fbd4d8dcf1eff616a553b82f71
fix merge problem
sfa/client/sfi.py