Author: imp Date: Sun Aug 22 21:59:55 2010 New Revision: 211662 URL: http://svn.freebsd.org/changeset/base/211662 Log: Merge gone wrong, trying to commit what I can before wiping and doing over Modified: Directory Properties: user/imp/tbemd/ (props changed) user/imp/tbemd/sys/ (props changed)