mergeinfo massaging

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