Mixed part of patch (FELIX-270)...I needed to do an "svn add".


git-svn-id: https://svn.apache.org/repos/asf/incubator/felix/trunk@530141 13f79535-47bb-0310-9956-ffa450edef68
16 files changed