Replaced xserv with clair and sciport with sakura
Authored by: selig 2010-02-11
Parent: [r4491]
Child: [r4493]