commit e818d27a372d021bc6025e7bce867ed06a8fc1ad Author: Ben Kaduk <kaduk at mit.edu> Date: Mon May 20 13:04:32 2013 -0400 Clarify that kdc.conf and krb5.conf are merged These two files are merged into the profile for KDC applications