Added Thomas' revisions
Merge pull request #233 from deb-cfengine/install4

Added Thomas' revisions