Revert "Removed config file fix for apache script as precise does not have the issue." commit for oneiric.

This reverts commit 13205d036c5106edc94a16f3001fced639f5a148.
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Revert "Removed resolv.conf lines as the interfaces file is used to generate it now."

This reverts commit 5f1dca326aeeacfde4d1c5d1fa03f3138ad7c25c.
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merged in changes from master branch. Modified network script to keep previous commit d5675315b3f8c28a4fa36227ae3422f5ccfaa983.
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric
Merge branch 'master' into oneiric