0.7 ready: API changed to allow the same OID used in different type of entities
Merge branch 'master' of github.com:rikulo/entity