o Fix the fact that configure had still had a conflict that needed     resolution
o Fix the fact that configure had still had a conflict that needed
    resolution

WearableComputerLab/LibWCL,WearableComputerLab/LibWCL,WearableComputerLab/LibWCL,WearableComputerLab/LibWCL