tree b029fba5eb89d03a72a8aab7fc2c93690f053ed6
parent 8d97a8ac422f6b7503f013023b4f0c33ae55be83
author Jeremy Hughes <hughesj@apache.org> 1325869012 +0000
committer Jeremy Hughes <hughesj@apache.org> 1325869012 +0000

mergeinfo massaging

git-svn-id: https://svn.apache.org/repos/asf/aries/branches/dec-2011-jndi-release@1228267 13f79535-47bb-0310-9956-ffa450edef68