[mythtv-firehose] mythtv/master commit: cc0c7115f by Robert McNamara (rmcnamara)

[MythTV]

      Author:  Robert McNamara <rmcnamara at mythtv.org>
 Change Date:  2011-07-11T08:30:25-07:00
   Push Date:  2011/07/11 08:31:12 -0700
  Repository:  mythtv
      Branch:  master
New Revision:  cc0c7115f6e78a1984ad6c4cfdfaa3445a85085e
   Changeset:  https://github.com/MythTV/mythtv/commit/cc0c7115f

Log:

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

Modified:

   mythtv/html/setup/js/channeleditor.js
   mythtv/libs/libmyth/mediamonitor-darwin.cpp
   mythtv/libs/libmythservicecontracts/datacontracts/videoMultiplex.h
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythui/AppleRemote.cpp
   mythtv/programs/mythbackend/services/channel.cpp