Robin Rosenberg cbab08fb28 Fix merge for "Partial revert "Switch build to Apache Felix maven-bundle-plugin"" ... There was a missing dependency. Change-Id: Ib7b9f05ee4c7c2bd7760ce44a7c2cd72759d514d Signed-off-by: Robin Rosenberg <robin.rosenberg@dewire.com>		2010-01-12 20:40:57 +01:00
..
services	Merge branch 'cq-diff'	2010-01-06 09:55:19 -08:00
MANIFEST.MF	Fix merge for "Partial revert "Switch build to Apache Felix maven-bundle-plugin""	2010-01-12 20:40:57 +01:00