I've resolved all the conflicts in: bin config.test debian doc examples Just in case someone else is working on this as well. --=20 Bob Tanner <tanner@real-time.com> | Phone : (952)943-8700 http://www.mn-linux.org, Minnesota, Linux | Fax : (952)943-8500 http://www.linuxjustworks.com | Linux Just Works! =20 Key fingerprint =3D AB15 0BDF BCDE 4369 5B42 1973 7CF1 A709 2CC1 B288