[perl-Authen-Krb5/el5/master: 15/15] Merge remote-tracking branch 'origin/master' into el5

[Simon Wilkinson]

commit 947a56acac1bc487bfa254e9664bcd1c93ad33fd
Merge: 0f4e0d4 fdc5e44
Author: Simon Wilkinson <simon at sxw.org.uk>
Date:   Tue Feb 8 15:03:25 2011 +0000

    Merge remote-tracking branch 'origin/master' into el5
    
    Conflicts:
    	.gitignore
    	perl-Authen-Krb5.spec
    	sources

 .gitignore            |    1 +
 perl-Authen-Krb5.spec |   13 ++++++-------
 sources               |    2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --cc perl-Authen-Krb5.spec
index 6821e5d,94cf872..97291b4
--- a/perl-Authen-Krb5.spec
+++ b/perl-Authen-Krb5.spec
@@@ -67,6 -63,30 +63,9 @@@ rm -rf $RPM_BUILD_ROO
  %{_mandir}/man3/*
  
  %changelog
+ * Tue Feb 8 2011 Simon Wilkinson <simon at sxw.org.uk> - 1.9-1
+ - 673472 Update to 1.9
+ 
 -* Wed Dec 15 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.7-10
 -- 661697 rebuild for fixing problems with vendorach/lib
 -
 -* Thu Apr 29 2010 Marcela Maslanova <mmaslano at redhat.com> - 1.7-9
 -- Mass rebuild with perl-5.12.0
 -
 -* Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 1.7-8
 -- rebuild against perl 5.10.1
 -
 -* Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 -
 -* Thu Feb 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7-6
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 -
 -* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7-5
 -Rebuild for new perl
 -
 -* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 1.7-4
 -- Autorebuild for GCC 4.3
 -
  * Tue Jan 29 2008 Simon Wilkinson <simon at sxw.org.uk> 1.7-3
  - Fix library path, so that libk5crypto is used, and not libcrypto