infinispan/infinispan — pull request #1069 by vblagoje (2012-04-17 20:15:44+00:00)
Title: ISPN-1984 and ISPN-1886

Prepared for 5.1.x only! Related JIRAs are:
https://issues.jboss.org/browse/ISPN-1984
https://issues.jboss.org/browse/ISPN-1886