Merge branch 'master' into trac1462

diff --cc src/bin/xfrout/tests/xfrout_test.py.in
Simple merge

diff --cc src/bin/xfrout/xfrout.py.in
Simple merge