Merge lp://staging/~logan/ubuntu/quantal/nfs-utils/debian-merge into lp://staging/ubuntu/quantal/nfs-utils

.pc/.quilt_patches (+1/-0)
.pc/.quilt_series (+1/-0)
.pc/01-sm-notify-in-sbin.patch/utils/statd/statd.c (+0/-493)
.pc/02-524255-manpages.patch/utils/exportfs/nfsd.man (+0/-206)
.pc/02-524255-manpages.patch/utils/nfsd/nfsd.man (+0/-105)
.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.c (+0/-649)
.pc/03-handle-mtab-symlink.patch/utils/mount/fstab.h (+0/-31)
.pc/03-handle-mtab-symlink.patch/utils/mount/mount.c (+0/-550)
.pc/11-532048-reduce-verbosity.patch/utils/gssd/gss_util.c (+0/-341)
.pc/11-532048-reduce-verbosity.patch/utils/gssd/gssd_proc.c (+0/-1241)
.pc/16-mount.nfs.man-update-distinction-between-fstype.patch/utils/mount/mount.nfs.man (+0/-86)
.pc/17-multiarch-kerberos-paths.patch/aclocal/kerberos5.m4 (+0/-115)
.pc/18-osd_login-sbindir.patch/utils/osd_login/Makefile.am (+0/-12)
.pc/19-iscsiadm-path.patch/utils/osd_login/osd_login (+0/-118)
.pc/applied-patches (+0/-8)
aclocal/kerberos5.m4 (+0/-2)
debian/changelog (+27/-0)
debian/nfs-kernel-server.init (+7/-1)
utils/exportfs/nfsd.man (+0/-1)
utils/gssd/gss_util.c (+1/-1)
utils/gssd/gssd_proc.c (+3/-3)
utils/mount/fstab.c (+1/-1)
utils/mount/fstab.h (+0/-1)
utils/mount/mount.c (+0/-7)
utils/mount/mount.nfs.man (+4/-8)
utils/nfsd/nfsd.man (+0/-1)
utils/osd_login/Makefile.am (+8/-5)
utils/osd_login/osd_login (+4/-2)
utils/statd/statd.c (+1/-1)