infinispan/infinispan — pull request #968 by pmuir (2012-02-23 16:49:30+00:00)
Title: Ispn 1867

This will also apply cleanly to master, please cherry-pick it to there.