[bouncycastle/f15/master: 2/2] Merge branch 'master' into f15

[Orcan Ogetbil]

commit 719528548c0a8c317cbc839c692260cfd740acf5
Merge: e66fc82 ffee67b
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Mar 1 23:39:26 2011 -0500

    Merge branch 'master' into f15
    
    Conflicts:
    	bouncycastle.spec

 .gitignore                                     |    1 +
 bcprov-jdk16-1.45.pom => bcprov-jdk16-1.46.pom |    2 +-
 bouncycastle.spec                              |    9 +++++++--
 sources                                        |    2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)
---
diff --cc bouncycastle.spec
index c6e534d,f333ad7..ab62724
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@@ -171,9 -173,9 +173,12 @@@ f
  %{_javadocdir}/%{name}/
  
  %changelog
+ * Tue Mar 01 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-1
+ - Import Bouncy Castle 1.46.
+ 
 +* Tue Feb 22 2011 Karsten Hopp <karsten at redhat.com> -4
 +- bump release and rebuild for PPC
 +
  * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-3
  - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild