Updated default vhost config to use apache log variable
Merge branch 'master' into oneiric
Revert "Merge branch 'master' into oneiric"

This reverts commit 325abc4f072f73c6e31b12a98097a5402479a7e3, reversing
changes made to 3d4f17931fae9d9dd10e168dd51641c6f3a805f3.