infinispan/infinispan — pull request #1343 by vblagoje (2012-09-26 14:29:50+00:00)
Title: ISPN-2287 and ISPN-2286

Master only. A revised version of ISPN-2287 (after Manik's review) and ISPN-2286 (needs review).

https://issues.jboss.org/browse/ISPN-2287
https://issues.jboss.org/browse/ISPN-2286