infinispan/infinispan — pull request #1238 by Sanne (2012-08-11 17:44:53+00:00)
Title: ISPN-2193 and more master

See also #pull 1237 for the changes meant for 5.1.x