OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-451-gf26f465

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit f26f4651516b36263fd1de3c3aaa461ce623e71d
Author: Heimdal Developers <heimdal-discuss@sics.se>
Date:   Mon Nov 22 23:17:18 2010 +0000

    Import of code from heimdal
    
    This commit updates the code imported from heimdal to
    bd78baf668eca011257f05fef8334e0967500456 (switch-from-svn-to-git-1696-gbd78baf)
    
    Upstream changes are:
    
    Jeffrey Altman (1):
          Windows: Include winsock2.h before ws2tcpip.h
    
    Change-Id: I7eca90ad36d84ccec6ac416d82246f6b28f06948
    Reviewed-on: http://gerrit.openafs.org/3360
    Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
    Tested-by: Jeffrey Altman <jaltman@openafs.org>

 src/external/heimdal-last             |    2 +-
 src/external/heimdal/roken/roken.h.in |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

-- 
OpenAFS Master Repository