infinispan/infinispan — pull request #1400 by galderz (2012-10-16 14:52:16+00:00)
Title: ISPN-2330 and port of ISPN-2297 to 5.1.x

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.