[krb5-appl/f16: 6/6] Merge remote-tracking branch 'origin/master' into f16

[Nalin Dahyabhai]

commit c2bf4aa9269d9dd0ab29b608eb48ac8f4e7761d6
Merge: 01ae3fd 9fee080
Author: Nalin Dahyabhai <nalin at dahyabhai.net>
Date:   Mon Jan 23 21:42:33 2012 -0500

    Merge remote-tracking branch 'origin/master' into f16
    
    Conflicts:
    	krb5-appl.spec

 krb5-appl-1.0.1-buffer.patch |   18 +++++++++++++-----
 krb5-appl-ftp-mdir.patch     |   21 +++++++++++++++++++++
 krb5-appl.spec               |   12 +++++++++++-
 3 files changed, 45 insertions(+), 6 deletions(-)
---