Adding Obsoletes and Conflicts functionality to plugin for RPM packaging
Code review changes including fixing some naming errors and adding test check conditions
Updated redline version to Java6 compatible version of redline

Conflicts:
	build.gradle
Added extra unit test to test obsoletes and conflicts header population in RPM
Merge remote-tracking branch 'upstream/gradle-1.9' into gradle-1.9

Conflicts:
	src/test/groovy/com/netflix/gradle/plugins/rpm/RpmPluginTest.groovy
Merge remote-tracking branch 'ngutzmann/gradle-1.9' into add-obsoletes-conflicts

Conflicts:
	src/main/groovy/com/netflix/gradle/plugins/packaging/Dependency.groovy
	src/main/groovy/com/netflix/gradle/plugins/packaging/SystemPackagingTask.groovy
Break out Template code, and add a Spock test
Use MetaBeanProperty explicitly
Trust that the mode variables pulls values from the spec fine.
Fix version in gradle.properties
Fixing version in gradle.properties
Add docs.
Merge pull request #27 from quidryan/add-obsoletes-conflicts

Add obsoletes conflicts
Correct usage of the CONFIG stance

See
https://github.com/nebula-plugins/gradle-ospackage-plugin/issues/12#issuecomment-39724619
Merge remote-tracking branch 'origin/master' into add-requires
Merge pull request #29 from jrottenberg/config-error-in-readme

Correct usage of the CONFIG stance
More resilient meta property reading
Fix newlines with empty depends
Merge pull request #30 from quidryan/add-requires

Add requires