infinispan/infinispan — pull request #916 by Sanne (2012-01-31 11:36:54+00:00)
Title: ISPN-1803 and ISPN-1815 for master

https://issues.jboss.org/browse/ISPN-1815
https://issues.jboss.org/browse/ISPN-1803