Merge change I4db3a5b3 into eclair

* changes:
  fix a javadoc build breakage