Merging fixes from trunk http://svn.apache.org/viewvc?rev=617235&view=rev http://svn.apache.org/viewvc?rev=617255&view=rev http://svn.apache.org/viewvc?rev=617266&view=rev http://svn.apache.org/viewvc?rev=617279&view=rev git-svn-id: https://svn.apache.org/repos/asf/openejb/branches/openejb-3.0-beta-2@617285 13f79535-47bb-0310-9956-ffa450edef68