infinispan/infinispan — pull request #1401 by galderz (2012-10-16 14:53:33+00:00)
Title: ISPN-2330 and fix for ISPN-2297

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