fix merge
authorTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:43:22 +0000 (22:43 -0500)
committerTony Mack <tmack@paris.CS.Princeton.EDU>
Fri, 11 Nov 2011 03:43:22 +0000 (22:43 -0500)
commit37e3aa340adc25a9f153217be91aa5a18d77e2e3
treebfd6d1789e0b7669e6e1f85f3b9127d4fdcc7d44
parentc8116d75f278fd2127406079d529b1e05adbecce
fix merge
sfa/rspecs/versions/sfav1.py
sfa/util/xml.py