tree 442c243349e749171e2b4a3bfc45cdb5ce6da139
parent 7543d9b0c96e7a9708a3b226f17861fffac69901
author Alex Karasulu <akarasulu@apache.org> 1141659344 +0000
committer Alex Karasulu <akarasulu@apache.org> 1141659344 +0000

merging mavenized branch changes from revision 382466 to the current head

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