Summary of changes: 127cd3b... Minor cosmetic fix - wrong svn tag in Release (*) c2051f6... resolve header conflict with duplicate definition in scale* (*) 3e25228... Next svn snapshot - ver. 296 (*) 38c38f2... Merge branch 'master' into f17 (*) This commit already existed in another branch; no separate mail sent