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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-10T18:21:46-07:00
   Push Date:  2011/07/10 18:59:28 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  19e45304e364cd9c7965cdcf32b1946757602038
   Changeset:  https://github.com/MythTV/mythtv/commit/19e45304e

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythtv/bindings/perl/MythTV.pm
   mythtv/bindings/php/MythBackend.php
   mythtv/bindings/python/MythTV/dataheap.py
   mythtv/bindings/python/MythTV/mythproto.py
   mythtv/bindings/python/MythTV/static.py
   mythtv/bindings/python/MythTV/ttvdb/XSLT/tvdbVideo.xsl
   mythtv/bindings/python/MythTV/ttvdb/tvdbXslt.py
   mythtv/libs/libmyth/mediamonitor-unix.cpp
   mythtv/libs/libmyth/programinfo.cpp
   mythtv/libs/libmythbase/mythbaseexp.h
   mythtv/libs/libmythbase/mythdbcon.cpp
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythmedia.cpp
   mythtv/libs/libmythbase/mythsocket.cpp
   mythtv/libs/libmythbase/mythsocketthread.cpp
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythbase/remotefile.cpp
   mythtv/libs/libmythprotoserver/requesthandler/fileserverhandler.cpp
   mythtv/libs/libmythtv/audioinputalsa.cpp
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythtv/cc608decoder.cpp
   mythtv/libs/libmythtv/channelscan/channelimporter.cpp
   mythtv/libs/libmythtv/channelscan/channelscanner_cli.cpp
   mythtv/libs/libmythtv/dvbchannel.cpp
   mythtv/libs/libmythtv/eitcache.cpp
   mythtv/libs/libmythtv/importrecorder.cpp
   mythtv/libs/libmythtv/interactivetv.cpp
   mythtv/libs/libmythtv/livetvchain.cpp
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythtv/programdata.cpp
   mythtv/libs/libmythtv/recorderbase.cpp
   mythtv/libs/libmythtv/subtitlescreen.cpp
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/programs/mythbackend/autoexpire.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/playbacksock.cpp
   mythtv/programs/mythbackend/playbacksock.h
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythfilldatabase/filldata.cpp
   mythtv/programs/mythtranscode/mpeg2fix.cpp
   mythtv/programs/mythtranscode/transcode.cpp