Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2 * commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542': fix a javadoc build breakage
Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-mr2 * commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542': fix a javadoc build breakage