am 44e994e1: am 036832ad: Merge change Ic944ab1e into eclair-mr2

Merge commit '44e994e1d47deab75c19d8684e4da8398b448044'

* commit '44e994e1d47deab75c19d8684e4da8398b448044':
  Extract and check in NotepadCodeLab.zip for change tracking