Minor clean-up/move.
Minor clean-up/move.

svn path=/trunk/; revision=483

GNOME/rygel,Pelagicore/Media-Manager-Rygel-patched,jku/rygel,luisbg/rygel,Pelagicore/Media-Manager-Rygel-patched,Pelagicore/Media-Manager-Rygel-patched,GNOME/rygel,Tarnyko/rygel,jku/rygel,Tarnyko/rygel,GNOME/rygel