[icedtea-web: 4/4] Merge branch 'f17'

[Deepak Bhole]

commit f30374b4fa72d6f0a96b762390472c069daa8197
Merge: 0830206 8bf698f
Author: Deepak Bhole <dbhole at redhat.com>
Date:   Tue Jul 31 14:46:33 2012 -0400

    Merge branch 'f17'
    
    Updated to 1.2.1
    Resolves: RH840592/CVE-2012-3422
    Resolves: RH841345/CVE-2012-3423

 .gitignore       |    1 +
 icedtea-web.spec |    9 +++++++--
 sources          |    2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --cc icedtea-web.spec
index b2b6a26,6b5ec92..1c5e08a
--- a/icedtea-web.spec
+++ b/icedtea-web.spec
@@@ -168,9 -168,11 +168,14 @@@ exit 
  %doc COPYING
  
  %changelog
+ * Tue Jul 31 2012 Deepak Bhole <dbhole at redhat.com> 1.2.1-1
+ - Updated to 1.2.1
+ - Resolves: RH840592/CVE-2012-3422
+ - Resolves: RH841345/CVE-2012-3423
+ 
 +* Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2-5
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 +
  * Thu May 03 2012 Deepak Bhole <dbhole at redhat.com> 1.2-4
  - Resolves rhbz#814585
  - Fixed java-plugin provides and added one for javaws