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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-05-05T10:07:39-07:00
   Push Date:  2011/05/05 10:07:54 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  fa2cc22e1d470537f5e27a95a1b93efa14cf7a4b
   Changeset:  https://github.com/MythTV/mythtv/commit/fa2cc22e1

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/libs/libmythtv/DeviceReadBuffer.cpp
	mythtv/libs/libmythtv/dtvrecorder.cpp
	mythtv/libs/libmythtv/dvbrecorder.cpp
	mythtv/libs/libmythtv/dvbstreamhandler.cpp
	mythtv/libs/libmythtv/hdhrrecorder.cpp
	mythtv/libs/libmythtv/hdhrstreamhandler.cpp
	mythtv/libs/libmythtv/mpegrecorder.cpp

Modified:

   mythplugins/mythbrowser/mythbrowser/mythbrowser.cpp
   mythplugins/mythbrowser/mythbrowser/mythbrowser.h
   mythplugins/mythbrowser/mythbrowser/webpage.cpp
   mythplugins/mythbrowser/theme/default-wide/browser-ui.xml
   mythtv/configure
   mythtv/libs/libmyth/uilistbtntype.cpp
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/avformatdecoder.h
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/libmythtv.pro
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/mythplayer.h
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythtv/subtitlescreen.h
   mythtv/libs/libmythtv/tv_actions.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythmainwindow.h
   mythtv/libs/libmythui/mythuiwebbrowser.cpp
   mythtv/libs/libmythui/mythuiwebbrowser.h
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/themes/MythCenter-wide/base.xml