Added status to conflict(8) man page to note that it is deprecated.
[mmh] / docs / README-components
2012-02-27 Ken HornsteinAdd a new README documenting the changes to the compone...