Resolve minor conflict in merge.
[mech_eap.git] / mech_eap / NEWS