merge rev 648055 from branches/2.1 - Upgrade activemq and tranql versions
merge rev 648055 from branches/2.1 - Upgrade activemq and tranql versions

git-svn-id: 0d16bf2c240b8111500ec482b35765e5042f5526@648269 13f79535-47bb-0310-9956-ffa450edef68

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