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

[MythTV]

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

Log:

Merge commit '9b2246' into mythtv-rec2

Conflicts:
	mythtv/configure
	mythtv/libs/libmythtv/DeviceReadBuffer.cpp
	mythtv/libs/libmythtv/cardutil.cpp
	mythtv/libs/libmythtv/cardutil.h
	mythtv/libs/libmythtv/channelbase.cpp
	mythtv/libs/libmythtv/channelbase.h
	mythtv/libs/libmythtv/dtvconfparserhelpers.cpp
	mythtv/libs/libmythtv/dtvconfparserhelpers.h
	mythtv/libs/libmythtv/libmythtv.pro
	mythtv/libs/libmythtv/mpegrecorder.h
	mythtv/libs/libmythtv/recorderbase.cpp
	mythtv/libs/libmythtv/videosource.cpp
	mythtv/libs/libmythtv/videosource.h
	mythtv/programs/mythbackend/main_helpers.h

Modified:

   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/channelbase.h