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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-06-30T09:34:36-07:00
   Push Date:  2011/06/30 09:56:30 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  cd0ab85f97b3dfd9f8655fb072921b765e77588a
   Changeset:  https://github.com/MythTV/mythtv/commit/cd0ab85f9

Log:

Merge branch 'master' into mythtv-rec2

Modified:

   mythplugins/mytharchive/mytharchivehelper/main.cpp
   mythplugins/mythnetvision/mythfillnetvision/main.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.cpp
   mythtv/libs/libmythbase/mythcommandlineparser.h
   mythtv/libs/libmythbase/mythlogging.cpp
   mythtv/libs/libmythbase/mythlogging.h
   mythtv/libs/libmythbase/mythversion.h
   mythtv/libs/libmythmetadata/metadatacommon.cpp
   mythtv/libs/libmythmetadata/metadatacommon.h
   mythtv/libs/libmythmetadata/metadatadownload.cpp
   mythtv/libs/libmythmetadata/metadatadownload.h
   mythtv/libs/libmythtv/decoderbase.h
   mythtv/libs/libmythtv/jitterometer.cpp
   mythtv/libs/libmythtv/jitterometer.h
   mythtv/libs/libmythtv/mythplayer.cpp
   mythtv/libs/libmythui/mythuiutils.cpp
   mythtv/libs/libmythupnp/soapclient.h
   mythtv/libs/libmythupnp/ssdpcache.cpp
   mythtv/libs/libmythupnp/upnptasksearch.cpp
   mythtv/programs/mythavtest/main.cpp
   mythtv/programs/mythbackend/main.cpp
   mythtv/programs/mythcommflag/ClassicCommDetector.cpp
   mythtv/programs/mythcommflag/PrePostRollFlagger.cpp
   mythtv/programs/mythcommflag/main.cpp
   mythtv/programs/mythfilldatabase/main.cpp
   mythtv/programs/mythfrontend/main.cpp
   mythtv/programs/mythfrontend/videodlg.cpp
   mythtv/programs/mythjobqueue/main.cpp
   mythtv/programs/mythlcdserver/main.cpp
   mythtv/programs/mythmediaserver/main.cpp
   mythtv/programs/mythpreviewgen/main.cpp
   mythtv/programs/mythshutdown/main.cpp
   mythtv/programs/mythtranscode/main.cpp
   mythtv/programs/mythtranscode/transcode.cpp
   mythtv/programs/mythtv-setup/main.cpp
   mythtv/programs/mythwelcome/main.cpp
   mythtv/themes/default-wide/osd.xml
   mythtv/themes/default/osd.xml