OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-415-g901460e

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 901460e50501e7d46fd56f94b96a93b407441532
Author: Heimdal Developers <heimdal-discuss@sics.se>
Date:   Mon Nov 15 15:35:31 2010 -0500

    Import of code from heimdal
    
    This commit updates the code imported from heimdal to
    387b0fa7baf724cc260559ff8774c04e0e8f7487 (switch-from-svn-to-git-1676-g387b0fa)
    
    Upstream changes are:
    
    Andrew Tridgell (1):
          heimdal: fixed a shadowed variable warning for error_message
    
    Change-Id: I515500ae3c79b3f87393c5fd4f7640d64104ca53
    Reviewed-on: http://gerrit.openafs.org/3311
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/external/heimdal-last               |    2 +-
 src/external/heimdal/krb5/config_file.c |   46 ++++++------
 src/external/heimdal/roken/vsyslog.c    |  113 +++++++++++++++++++++++++++++++
 3 files changed, 137 insertions(+), 24 deletions(-)

-- 
OpenAFS Master Repository