Merge pull request #371 from aidvu/fstab-swap