Merge change I3a62e1c2 into eclair-mr2

* changes:
  Solve the mutual interdependency problem between common and framework: Have framework include the common source files directly when building, then build common as a static library separately (depending on framework, like everything else).