tree 96f0a4c93012f86629d74cbcd66fb5962a50112c
parent b85e80ed47d4d363f5a353ce4be1dac5f5d33f88
parent 51c633d11589fe6f4278dc167a52e8925bb2f8b8
author Miles Parker <milesparker@gmail.com> 1293062372 -0800
committer Miles Parker <milesparker@gmail.com> 1293062372 -0800

Merge branch 'recovered-2'

Conflicts:
	releng/org.eclipse.amp.build-feature/buckminster.cspex
	releng/org.eclipse.amp.build-feature/feature.xml
	releng/org.eclipse.amp.releng/promoter.ant
	releng/org.eclipse.amp.releng/publisher.properties