<yosh> shut up cvs </yosh>
The grand "themus->control-center" merge. See individual ChangeLogs for details.