[packages_10.03.2] nullmailer: merge r29199