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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-12T10:23:59-07:00
   Push Date:  2011/05/12 10:24:09 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  5c416993911cda66fabb1d22cca2ee3f1c81a7af
   Changeset:  https://github.com/MythTV/mythtv/commit/5c4169939

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythtv/dtvsignalmonitor.cpp

Modified:

   mythtv/libs/libmyth/audio/audiooutputalsa.cpp
   mythtv/libs/libmythtv/dtvsignalmonitor.cpp
   mythtv/libs/libmythtv/dvdringbuffer.cpp
   mythtv/libs/libmythtv/mhi.cpp
   mythtv/libs/libmythtv/mpeg/tspacket.h
   mythtv/libs/libmythui/mythmainwindow.cpp
   mythtv/libs/libmythui/mythuiactions.h
   mythtv/programs/mythfrontend/mythfexml.cpp
   mythtv/programs/mythfrontend/mythfexml.h
   mythtv/programs/mythfrontend/networkcontrol.cpp