[mythtv-commits] mythtv commit: d5a786d by Robert McNamara (rmcnamara)

[MythTV]

      Author:  Robert McNamara <rmcnamara at mythtv.org>
 Change Date:  2010-12-07T12:22:41-08:00
   Push Date:  2010/12/07 12:22:56 -0800
  Repository:  mythtv
      Branch:  master
New Revision:  d5a786dda42cf79db721cbbbb118bb868a8efe80
   Changeset:  https://github.com/MythTV/mythtv/commit/d5a786d

Log:

Merge branch 'master' of github.com:MythTV/mythtv

Modified:

   mythplugins/mythgame/mythgame/scripts/giantbomb/__init__.py
   mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_api.py
   mythplugins/mythgame/mythgame/scripts/giantbomb/giantbomb_exceptions.py
   mythtv/bindings/python/MythTV/_conn_mysqldb.py
   mythtv/bindings/python/MythTV/_conn_oursql.py
   mythtv/contrib/imports/mirobridge/mirobridge/__init__.py
   mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_0_3.py
   mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_2_5_2.py
   mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_0_0.py
   mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_3_5_0.py
   mythtv/libs/libmyth/audio/audiooutputsettings.cpp
   mythtv/programs/mythfrontend/globalsettings.cpp
   mythtv/programs/scripts/internetcontent/nv_python_libs/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bbciplayer/bbciplayer_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/bliptv/bliptv_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/common/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/common/common_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/dailymotion/dailymotion_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/hulu/hulu_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mashups/mashups_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mnvsearch/mnvsearch_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/mtv/mtv_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/pbs/pbs_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/rev3/rev3_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/tedtalks/tedtalks_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/thewb/thewb_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/oauth/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/vimeo/vimeo_exceptions.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/bliptvXSL_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/chrisPirillo_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/cinemarv_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/comedycentral_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/hubbleCast_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/linuxAction_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/mevio_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/nasa_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/pbsXSL_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/revision3XSL_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/skyAtNight_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/spitzer_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tedtalksXSL_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/traileraddicts_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/tributeca_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/xsltfunctions/youtubeXSL_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/__init__.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_api.py
   mythtv/programs/scripts/internetcontent/nv_python_libs/youtube/youtube_exceptions.py