[mythtv-firehose] mythtv/new-logging commit: d5ee61f0d by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-05T15:08:45-07:00
   Push Date:  2011/05/05 15:09:01 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  d5ee61f0da77a3175a2390b709924e519cae0928
   Changeset:  https://github.com/MythTV/mythtv/commit/d5ee61f0d

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythbase/libmythbase.pro
	mythtv/libs/libmythbase/mythsocketthread.cpp
	mythtv/programs/mythbackend/mainserver.cpp

Added:

   mythtv/libs/libmythbase/mythbaseutil.h

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/libs/libmyth/mythcontext.cpp
   mythtv/libs/libmyth/uilistbtntype.cpp
   mythtv/libs/libmythbase/httpcomms.cpp
   mythtv/libs/libmythbase/httpcomms.h
   mythtv/libs/libmythbase/libmythbase.pro
   mythtv/libs/libmythbase/mythcorecontext.cpp
   mythtv/libs/libmythbase/mythobservable.cpp
   mythtv/libs/libmythbase/mythsocketthread.cpp
   mythtv/libs/libmythbase/mythsocketthread.h
   mythtv/libs/libmythtv/DeviceReadBuffer.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/dtvrecorder.cpp
   mythtv/libs/libmythtv/dvbrecorder.cpp
   mythtv/libs/libmythtv/dvbstreamhandler.cpp
   mythtv/libs/libmythtv/eithelper.cpp
   mythtv/libs/libmythtv/firewiredevice.cpp
   mythtv/libs/libmythtv/firewirerecorder.cpp
   mythtv/libs/libmythtv/hdhrrecorder.cpp
   mythtv/libs/libmythtv/hdhrstreamhandler.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederfile.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederrtp.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederrtsp.cpp
   mythtv/libs/libmythtv/iptv/iptvfeederudp.cpp
   mythtv/libs/libmythtv/iptvrecorder.cpp
   mythtv/libs/libmythtv/linuxfirewiredevice.cpp
   mythtv/libs/libmythtv/mpeg/dvbdescriptors.cpp
   mythtv/libs/libmythtv/mpeg/mpegstreamdata.cpp
   mythtv/libs/libmythtv/mpeg/mpegstreamdata.h
   mythtv/libs/libmythtv/mpeg/mpegtables.cpp
   mythtv/libs/libmythtv/mpeg/mpegtables.h
   mythtv/libs/libmythtv/mpeg/pespacket.cpp
   mythtv/libs/libmythtv/mpeg/pespacket.h
   mythtv/libs/libmythtv/mpeg/tspacket.cpp
   mythtv/libs/libmythtv/mpeg/tspacket.h
   mythtv/libs/libmythtv/mpegrecorder.cpp
   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/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/mainserver.h
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/themes/MythCenter-wide/base.xml