Merge branch 'master' into core-updates Conflicts: guix/packages.scm
gnu: Add phonon. * gnu/packages/kde.scm (phonon): New variable.
Merge branch 'master' into core-updates
gnu: kde: Add module and automoc4 package. * gnu/packages/kde.scm: New file. * gnu-system.am (GNU_SYSTEM_MODULES): Add it.