merge svn 1.7+ fix for assembly description from trunk
1 file changed