Conflicts: ChangeLog src/bin/bind10/bind10.py.in src/bin/bind10/bob.spec src/bin/bind10/tests/bind10_test.py.in