Merge changes from trunk to 8.0.4
------------------------------------------------------------------------ r10056 | yaberauneya | 2012-02-07 22:30:30 -0800 (Tue, 07 Feb 2012) | 2 lines
Remove duplicate lines in rc scripts included in the patch so the subcommand rc scripts only execute once.
Authored by: yaberauneya 2012-02-08
Parent: [r10056]
Child: [r10058]
