Merged from trunk

diff --cc include/splay.h
Simple merge

diff --cc src/acl/Arp.cc
Simple merge

diff --cc src/acl/Arp.h
Simple merge

diff --cc src/eui/Eui48.cc
Simple merge

diff --cc src/eui/Eui48.h
Simple merge

diff --cc src/tests/stub_libeui.cc
Simple merge

diff --cc test-suite/splay.cc
Simple merge