Support the o, f and p options, patch by Magnus M�rtensson
2 files changed