Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-mr2 * commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad': fix a javadoc build breakage
Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-mr2 * commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad': fix a javadoc build breakage