From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 15 Nov 2011 03:35:16 +0000 (-0500)
Subject: fix merge
X-Git-Tag: sfa-1.1-3~8
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=6a51fdc15ef160552e5b94e9a3ad682eab5dcabf;p=sfa.git

fix merge
---

diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index ef480b4a..d1d7f5f0 100644
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -175,7 +175,7 @@ class PGv2(BaseVersion):
             in_rspec = in_rspec.toxml()
         
         rspec = RSpec(in_rspec)
-        for child in rspec.root.iterchildren():
+        for child in rspec.xml.iterchildren():
             self.xml.root.append(child)
 
     def cleanup(self):