[mythtv-firehose] mythtv/fixes/0.24 commit: 7f99d0f1e by Jean-Yves Avenard (jyavenard)

[MythTV]

      Author:  Jean-Yves Avenard <jyavenard at mythtv.org>
 Change Date:  2011-05-07T03:38:52-07:00
   Push Date:  2011/05/07 03:39:09 -0700
  Repository:  mythtv
      Branch:  fixes/0.24
New Revision:  7f99d0f1ea49ed69328d0c5d53c65c40c2690e8c
   Changeset:  https://github.com/MythTV/mythtv/commit/7f99d0f1e

Log:

Following SHA1:7b6c78856da1b8785cc856b6e1ef1ccd35d1947b. Fix improper merge

Modified:

   mythtv/libs/libmyth/audiooutputalsa.cpp