fix some mistakes in init scripts
Merge branch 'master' into 12.04