am f711e349: am 1f816cf5: Merge change I362bebd3 into eclair-mr2

Merge commit 'f711e3494ca8e740c19f77ec753051e0517208a3'

* commit 'f711e3494ca8e740c19f77ec753051e0517208a3':
  Include the common source files directly in the framework library