Marked my remaining unmerged changes as Unnecessary.  They are mostly build changes.
Marked my remaining unmerged changes as Unnecessary.  They are mostly build changes.


git-svn-id: d69ffe4ccc4861bf06065bd0072b85c931fba7ed@431201 13f79535-47bb-0310-9956-ffa450edef68

apache/geronimo,apache/geronimo,apache/geronimo,apache/geronimo