Merged trunk changes 17245:17471 into branch
[sfa.git] / sfa / util / __init__.py