Merge branch 'master' into unit-test-jdk7

Conflicts:
	btm/src/main/java/bitronix/tm/resource/jms/JmsPooledConnection.java
Merge pull request #20 from rankinc/unit-test-jdk7

Fix intermittent failure with JMS unit tests and Oracle JDK7.
Merge branch 'master' into cauldron