Merge branch 'master' into upd-pr-22

Author: Yoshito Umaoka

gp-res-filter/src/main/java/com/ibm/g11n/pipeline/resfilter/POTResource.java

@@ -120,7 +120,7 @@ public void write(OutputStream outStream, String language, Bundle bundle) throws
 
     /**
      * Note:
-     * {@link POTResource#merge(InputStream, OutputStream, String, Collection)}
+     * {@link POTResource#merge(InputStream, OutputStream, String, Bundle)}
      * does not support plural forms in PO/POT files, they will be left as-is.
      */
     @Override