Merge change I63d524fd into eclair-mr2

* changes:
  Fixing the build by renaming private "string.h" header file.