infinispan/infinispan — pull request #1237 by Sanne (2012-08-11 17:42:20+00:00)
Title: ISPN-2193 and more improvements / branch 5.1.x

*Warning* the pull for master contains additional improvements. The branch for 5.1.x only the essentials for the fix.
The commits in 5.1.x are the same (identical) to the first two of the pull for master.