infinispan/infinispan — pull request #667 by tristantarrant (2011-11-23 10:30:20+00:00)
Title: ISPN-1548: merge api and commons back into core

NB. THIS IS FOR DISCUSSION ONLY: IT MUST NOT BE PULLED

Unsplit packages from api / commons back into core
Leave the BasicCache and BasicCacheContainer changes that were introduced
Re-enable OSGi bundles