merge master again (2.0-10 changelog only)
Thierry Parmentelat [Fri, 27 Jan 2012 10:36:57 +0000 (11:36 +0100)]
1  2 
sfa.spec

diff --cc sfa.spec
Simple merge