ACCUMULO-86 - The merge of the META-INF files didn't quite work in trunk... or I broke it with my last commit
ACCUMULO-86 - The merge of the META-INF files didn't quite work in trunk... or I broke it with my last commit

git-svn-id: ee25ee0bfe882ec55abc48667331b454c011093e@1211094 13f79535-47bb-0310-9956-ffa450edef68

phrocker/accumulo-1,phrocker/accumulo-1,apache/accumulo,lstav/accumulo,mikewalch/accumulo,adamjshook/accumulo,keith-turner/accumulo,dhutchis/accumulo,mjwall/accumulo,phrocker/accumulo,mikewalch/accumulo,dhutchis/accumulo,adamjshook/accumulo,adamjshook/accumulo,ivakegg/accumulo,phrocker/accumulo,joshelser/accumulo,mikewalch/accumulo,wjsl/jaredcumulo,mjwall/accumulo,milleruntime/accumulo,adamjshook/accumulo,lstav/accumulo,joshelser/accumulo,ctubbsii/accumulo,adamjshook/accumulo,keith-turner/accumulo,mikewalch/accumulo,apache/accumulo,lstav/accumulo,milleruntime/accumulo,phrocker/accumulo,wjsl/jaredcumulo,wjsl/jaredcumulo,wjsl/jaredcumulo,dhutchis/accumulo,joshelser/accumulo,ivakegg/accumulo,mikewalch/accumulo,keith-turner/accumulo,mjwall/accumulo,phrocker/accumulo,ivakegg/accumulo,ivakegg/accumulo,phrocker/accumulo-1,wjsl/jaredcumulo,wjsl/jaredcumulo,joshelser/accumulo,apache/accumulo,ivakegg/accumulo,keith-turner/accumulo,joshelser/accumulo,ivakegg/accumulo,adamjshook/accumulo,keith-turner/accumulo,milleruntime/accumulo,dhutchis/accumulo,wjsl/jaredcumulo,phrocker/accumulo,lstav/accumulo,phrocker/accumulo,keith-turner/accumulo,keith-turner/accumulo,phrocker/accumulo,dhutchis/accumulo,mjwall/accumulo,mikewalch/accumulo,joshelser/accumulo,adamjshook/accumulo,apache/accumulo,ctubbsii/accumulo,mjwall/accumulo,apache/accumulo,phrocker/accumulo-1,phrocker/accumulo-1,milleruntime/accumulo,phrocker/accumulo-1,wjsl/jaredcumulo,mjwall/accumulo,ctubbsii/accumulo,ctubbsii/accumulo,joshelser/accumulo,apache/accumulo,dhutchis/accumulo,adamjshook/accumulo,ctubbsii/accumulo,lstav/accumulo,apache/accumulo,phrocker/accumulo,milleruntime/accumulo,phrocker/accumulo,dhutchis/accumulo,ctubbsii/accumulo,ctubbsii/accumulo,dhutchis/accumulo,adamjshook/accumulo,dhutchis/accumulo,mjwall/accumulo,milleruntime/accumulo,phrocker/accumulo-1,mikewalch/accumulo,ivakegg/accumulo,mikewalch/accumulo,lstav/accumulo,milleruntime/accumulo,joshelser/accumulo,lstav/accumulo