Merge change Ic944ab1e into eclair-mr2

* changes:
  Extract and check in NotepadCodeLab.zip for change tracking