Adding two missing packages.
Unmerging fetchmailrc