Conflict Mainstreaming

One of the more recent trends in peacebuilding and development is to mainstream conflict resolution throughout all stages of the program lifecycle. Instead of seeing conflict resolution as a separate activity, it is something that should be integrated into assessment, implementation, evaluation. Equally important is the idea that a conflict sensitive approach can be integrated across diverse sectors such as health programming, environmental issues, humanitarian relief.
There is however is a fine line between this integration as not all development projects should be peacebuilding and not all peacebuilding work is connected to development work. I am curious what others thing about conflict mainstreaming. What has been your experience? What are some of your favorite resources?
Two organizations that have done extensive work in this area (and have many free publications on their websites) are International Alert and the Collaborative Development for Action.