Merge change I11f66b41 into eclair-mr2

* changes:
  Remove unused SOURCE_ID constant.