[mythtv-firehose] mythtv/jyavenard/backports/fixes/0.24 commit: 069fc0480 by Jean-Yves Avenard (jyavenard)

[MythTV]

      Author:  Jean-Yves Avenard <jyavenard at mythtv.org>
 Change Date:  2011-10-05T22:08:58-07:00
   Push Date:  2011/10/05 22:09:55 -0700
  Repository:  mythtv
      Branch:  jyavenard/backports/fixes/0.24
New Revision:  069fc0480bb93199fecc0074e4006ba0a385426d
   Changeset:  https://github.com/MythTV/mythtv/commit/069fc0480

Log:

Merge branch 'fixes/0.24' of github.com:MythTV/mythtv into jyavenard/backports/fixes/0.24

Conflicts:
	mythtv/libs/libmyth/audiooutputbase.cpp
	mythtv/libs/libmyth/audiooutputbase.h

Modified:

   mythplugins/mythgallery/i18n/mythgallery_da.qm
   mythplugins/mythgallery/i18n/mythgallery_da.ts
   mythtv/contrib/imports/mirobridge/mirobridge/mirobridge_interpreter_4_0_2.py
   mythtv/i18n/mythfrontend_da.qm
   mythtv/i18n/mythfrontend_da.ts