merge omapzoom wpan changes