Merge change Id6f158b3 into eclair

* changes:
  Removed javadoc link to hidden class (temporary fix for build)