Fix the multimedia problem on basic-xwindows slightly differently - have it included, but drop pulseaudio-module-bluetooth from the group.

pulseaudio-module-bluetooth requires (indirectly, via bluez) a PIN query agent,
such as bluedevil, gnome-bluetooth, or blueman. Since bluedevil and
gnome-bluetooth already require pulseaudio-module-bluetooth, drop it from
@multimedia, and the desktop environments can bring it in indirectly. Bug
filed against blueman to also add this requirement.

comps-f18.xml.in

@@ -48,7 +48,6 @@
       <packagereq>alsa-utils</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
       <packagereq>pulseaudio</packagereq>
-      <packagereq>pulseaudio-module-bluetooth</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
       <packagereq>pulseaudio-module-x11</packagereq>
     </packagelist>
@@ -5930,12 +5929,12 @@
       <groupid>dial-up</groupid>
       <groupid>fonts</groupid>
       <groupid>hardware-support</groupid>
+      <groupid>multimedia</groupid>
     </grouplist>
     <optionlist>
       <groupid>firefox</groupid>
       <groupid>input-methods</groupid>
       <groupid>legacy-fonts</groupid>
-      <groupid>multimedia</groupid>
       <groupid>xmonad</groupid>
     </optionlist>
   </environment>

comps-f19.xml.in

@@ -48,7 +48,6 @@
       <packagereq>alsa-utils</packagereq>
       <packagereq>alsa-plugins-pulseaudio</packagereq>
       <packagereq>pulseaudio</packagereq>
-      <packagereq>pulseaudio-module-bluetooth</packagereq>
       <packagereq>pulseaudio-utils</packagereq>
       <packagereq>pulseaudio-module-x11</packagereq>
     </packagelist>