infinispan/infinispan — pull request #1399 by galderz (2012-10-16 14:49:50+00:00)
Title: 5.1.x version of ISPN-2330

On top of https://issues.jboss.org/browse/ISPN-2330, it also backports https://issues.jboss.org/browse/ISPN-2297 and fixes an issue on the original ISPN-2297 fix.