OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-245-g5142f16

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 5142f16bd37345fa15ec1cb24b519d936baae99a
Author: Simon Wilkinson <sxw@your-file-system.com>
Date:   Mon Oct 11 15:18:06 2010 -0400

    hcrypto: Tidy up some merge conflicts
    
    There were some (harmless) merge conflicts in the hcrypto Makefile.
    Get rid of them.
    
    Change-Id: Iaf67d234d0f9ff24432479b2ae065adb73d5665b
    Reviewed-on: http://gerrit.openafs.org/2963
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/crypto/hcrypto/Makefile.in |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

-- 
OpenAFS Master Repository