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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-16T12:34:41-07:00
   Push Date:  2011/05/16 12:34:53 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  bc07f5f7b362ce268edaaf9a54873860455d7dc5
   Changeset:  https://github.com/MythTV/mythtv/commit/bc07f5f7b

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythupnp/upnptasknotify.cpp

Added:

   mythtv/VERSION

Modified:

   mythplugins/mythgallery/dcrawplugin/dcrawplugin.cpp
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/NuppelVideoRecorder.cpp
   mythtv/libs/libmythupnp/upnptasknotify.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythbackend/scheduler.h
   mythtv/programs/mythfrontend/mediarenderer.cpp