infinispan/infinispan — pull request #1082 by Sanne (2012-04-23 14:36:30+00:00)
Title: ISPN-2003 and ISPN-2004 for 5.1.x

For branch 5.1.x only:

https://issues.jboss.org/browse/ISPN-2003
https://issues.jboss.org/browse/ISPN-2004

I'll send a different pull request for master as the needed patches are very different.