merging the zap_and_dahdi_trunk branch up to trunk