base

Merge change Ic9e65818 into eclair-mr2

* changes:
  Attempt to fix the build server build: make the common library not depend on the framework library (for now, at least).