OpenAFS Master Repository branch, master, updated. BP--openafs-stable-1_6_x-1369-g02aa308

[Gerrit Code Review]

The following commit has been merged in the master branch:
commit 02aa30893f79b0a3d3ed75da987e20d48071c5df
Author: Michael Meffie <mmeffie@sinenomine.net>
Date:   Mon Jul 11 15:45:11 2011 -0400

    salvager: do not redefine SalvageVolumeGroup
    
    Do not use the c preprocessor to redefine the SalvageVolumeGroup()
    function name.
    
    Change-Id: I3d48ee28dc03be702d0427d74725ff1e99ec6411
    Reviewed-on: http://gerrit.openafs.org/4965
    Reviewed-by: Andrew Deason <adeason@sinenomine.net>
    Tested-by: BuildBot <buildbot@rampaginggeek.com>
    Reviewed-by: Derrick Brashear <shadow@dementia.org>

 src/vol/vol-salvage.c |    9 +++++++--
 src/vol/vol-salvage.h |    4 +---
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
OpenAFS Master Repository