ca17d211e8
* java/util/Properties.java (load): Fix wrongly merged fix. From-SVN: r80949
* java/util/Properties.java (load): Fix wrongly merged fix. From-SVN: r80949