infinispan/infinispan — pull request #1552 by normanmaurer (2013-01-04 09:26:03+00:00)
Title: ISPN-1954 and ISPN-2684

This fixes ISPN-1954 and ISPN-2684. I put both in one pull-req as ISPN1954 depends on ISPN-2684