tree bd4e22cb8a142d21cc6ea089785a71509aadd33d
parent 6f1124db218a235bb3c04e4277314cb3106f6c87
author Clement Escoffier <clement@apache.org> 1293110445 +0000
committer Clement Escoffier <clement@apache.org> 1293110445 +0000

Integrate the constructor-injection branch into the trunk.

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