K 10 svn:author V 8 bdrewery K 8 svn:date V 27 2016-05-13T17:44:20.658104Z K 7 svn:log V 75 Support libsoft for restage. This is essentially fixing a merge conflict. END