c39d6d3 Merge in Rob aci patch (resolve conflict)

Authored and Committed by simo 16 years ago
    Merge in Rob aci patch (resolve conflict)