merged trunk -r 18510:18539
[sfa.git] / LICENSE.txt
2008-12-05 Reed MoranLicense file