Merge m5read@m5.eecs.umich.edu:/bk/m5

into  zed.eecs.umich.edu:/z/benash/bk/m5

--HG--
extra : convert_revision : 5cfec85dbfc33b942929e6d379275618f2c60c33

python/m5/config.py

@@ -405,7 +405,7 @@ class SimObject(object):
                 if found_obj != None and child != found_obj:
                     raise AttributeError, \
                           'parent.any matched more than one: %s %s' % \
-                          (obj.path, child.path)
+                          (found_obj.path, child.path)
                 found_obj = child
         # search param space
         for pname,pdesc in self._params.iteritems():