Bring back the rc.d changes for this branch.
Authored by: yaberauneya 2012-01-12
Parent: [r9504]
Child: [r9506]