tree c714aff9c936d9569babb689dcd425eb8f54a1ce
parent c1f12e9d2d634ca25633eeb2180858fda558d2fc
author Marcel Offermans <marrs@apache.org> 1302554779 +0000
committer Marcel Offermans <marrs@apache.org> 1302554779 +0000

Applied patches in FELIX-2911 with some small changes. Should compile without problems now.

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@1091200 13f79535-47bb-0310-9956-ffa450edef68