tree 97e0cf1d81f3c325a315247fd76be6bf17fcf6ca
parent 493e414449bd410804110da1df367ce8c05dadf8
author schor <schor> 1278595813 +0000
committer schor <schor> 1278595813 +0000

[UIMA-1832] merge trunk -> branch (picked up changes in xml descriptors for activemq tests)