Committed a fix for javadocs from Michael Koch. Fixed javadoc conflicts introduced by the last commit.

build.xml

@@ -304,10 +304,10 @@
         <javadoc author="true" destdir="${java.doc}" package="true"
             version="true" use="true" windowtitle="SIP Communicator API"
             classpathref="compile.class.path" source="1.4+">
-            <fileset dir="${src}">
-                <exclude name="net/java/sip/communicator/impl/version/**/*.java"/>
-                <include name="**/*.java"/>
-            </fileset>
+            <packageset dir="${src}">
+                <exclude name="net/java/sip/communicator/impl/version/**"/>
+                <include name="**"/>
+            </packageset>
             <tag name="todo" description="To do:"/>
         </javadoc>
     </target>

src/net/java/sip/communicator/impl/media/RtpFlowImpl.java

@@ -96,9 +96,9 @@ public class RtpFlowImpl
      * media data between two end points, using the given media encoding.
      *
      * @param mediaServie the media service which created us
-     * @param localAddress local IP address
+     * @param localIpAddress local IP address
      * @param localPort local port number
-     * @param remoteAddress remote IP address
+     * @param remoteIpAddress remote IP address
      * @param remotePort remote port number
      * @param mediaEncoding media encoding used for data
      *

src/net/java/sip/communicator/impl/protocol/jabber/mediamgr/AudioMediaSession.java

@@ -48,7 +48,6 @@ public class AudioMediaSession
      * @param payloadType Payload used by jmf
      * @param remote      the remote information.
      * @param local       the local information.
-     * @param locator     media locator
      */
     public AudioMediaSession(PayloadType payloadType, TransportCandidate remote
             , TransportCandidate local)