tree eb13c3d7a7de6de1fa55d8f13434bc49d401a958
parent 34ba0214e59ce87df5ab7d6601fd5c159ac03d41
author David Jencks <djencks@apache.org> 1250008227 +0000
committer David Jencks <djencks@apache.org> 1250008227 +0000

GERONIMO-4786 merge changes from 2.1 branch r780437, r801468, r801849, r803183

git-svn-id: https://svn.apache.org/repos/asf/geronimo/components/txmanager/trunk@803194 13f79535-47bb-0310-9956-ffa450edef68