On Oct 20, 2009, at 8:45 PM, Samuel Thibault wrote:
An example is in topology-linux.c; svn merge didn't find a corresponding section for the change, but the section below it seems like it might have been replaced by theconflicting section...?This code is a new feature of the trunk (cgroup support)
Ok. I'll just port over the relevant change, then. Thanks! -- Jeff Squyres jsquy...@cisco.com
