[FIX] nonsensical import?
Merge branch 'master' of bzr::lp:openobject-server