Fixed bad job of resolving conflict(s) from the last merge.
Fixed bad job of resolving conflict(s) from the last merge.


OPENDAP/libdap,OPENDAP/libdap,OPENDAP/libdap4,OPENDAP/libdap4,OPENDAP/libdap,OPENDAP/libdap4,OPENDAP/libdap4,OPENDAP/libdap4,OPENDAP/libdap,OPENDAP/libdap4