[mythtv-firehose] mythtv/mythtv-rec2 commit: 673142f98 by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-16T10:59:55-07:00
   Push Date:  2011/05/16 12:34:53 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  673142f98e4f2ebb5d4837a19fdca13e2f900bc8
   Changeset:  https://github.com/MythTV/mythtv/commit/673142f98

Log:

Merge commit 'c91c375' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythupnp/ssdpcache.cpp
	mythtv/libs/libmythupnp/upnptasknotify.cpp

Added:

   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/Black-Background.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/description.txt
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/intro_preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/mainmenu_preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/preview.png
   mythplugins/mytharchive/mythburn/themes/Black_-_Multi-episode/theme.xml

Modified:

   mythtv/libs/libmythupnp/httpserver.cpp
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/programs/mythbackend/httpstatus.cpp
   mythtv/programs/mythbackend/httpstatus.h
   mythtv/programs/mythfrontend/mediarenderer.cpp