OpenAFS Master Repository branch, master, updated. openafs-devel-1_5_68-41-gda8c265

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit da8c26533d101f5e90d7c2d829441c0f2c48a63b
Author: Simon Wilkinson <sxw@inf.ed.ac.uk>
Date:   Tue Dec 29 17:03:50 2009 +0000

    Unix: Merge aklog with aklog_main
    
    Historically, aklog was split into aklog.c (which just contained a
    wrapper) and aklog_main.c, which did all of the hard work. Now
    that we've purged all of the Windows code from aklog_main.c, we
    can merge them both into the same file, so do so.
    
    FIXES 20884
    
    Change-Id: Ifdcb33f4eb2b26703c833056882d95f7f0f654b1
    Reviewed-on: http://gerrit.openafs.org/1036
    Reviewed-by: Derrick Brashear <shadow@dementia.org>
    Tested-by: Derrick Brashear <shadow@dementia.org>

 src/aklog/Makefile.in  |    4 ++--
 src/aklog/aklog.c      |   17 -----------------
 src/aklog/aklog_main.c |    2 +-
 3 files changed, 3 insertions(+), 20 deletions(-)

-- 
OpenAFS Master Repository