Commit 004adad0482bc9693587cd8c00791451a5fff9bd

William Pitcock 2012-07-30T02:46:03

pkg: improve conflicts handling