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

[Simon Wilkinson]

commit edbe25ba61a05dd8fc315f7a6efc440dff42eaa3
Merge: f0c6274 fdc5e44
Author: Simon Wilkinson <simon at sxw.org.uk>
Date:   Tue Feb 8 14:45:28 2011 +0000

    Merge remote-tracking branch 'origin/master' into el6
    
    Conflicts:
    	.gitignore

 perl-Authen-Krb5.spec |   22 +++++++++++++++-------
 sources               |    2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)
---