[mythtv-firehose] mythtv/new-logging commit: 1045d8afc by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-06-03T15:48:53-07:00
   Push Date:  2011/06/03 15:49:00 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  1045d8afc5f7abccbd31befd72cf84540392bee6
   Changeset:  https://github.com/MythTV/mythtv/commit/1045d8afc

Log:

Merge branch 'master' into new-logging

Modified:

   mythplugins/mythgallery/dcrawplugin/dcrawhandler.cpp
   mythtv/libs/libmythtv/osd.cpp
   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/ringbuffer.h
   mythtv/libs/libmythtv/tv_actions.h
   mythtv/libs/libmythtv/tv_play.cpp
   mythtv/libs/libmythtv/tv_play.h
   mythtv/themes/default-wide/osd.xml