Merge change Ib16749e2 into eclair-mr2

* changes:
  Refactoring the logging interface to remove dependence on NPP.