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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-06-02T21:30:31-07:00
   Push Date:  2011/06/02 21:30:52 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  300bfcf37dbd068fa6efbe087ab46bfeb1923014
   Changeset:  https://github.com/MythTV/mythtv/commit/300bfcf37

Log:

Merge branch 'master' into new-logging

Modified:

   mythtv/libs/libmythtv/ringbuffer.cpp
   mythtv/libs/libmythtv/streamingringbuffer.cpp
   mythtv/libs/libmythui/mythuitext.cpp
   mythtv/libs/libmythui/mythuitype.cpp
   mythtv/libs/libmythupnp/ssdp.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/upnpcdsmusic.cpp
   mythtv/programs/mythbackend/upnpcdstv.cpp
   mythtv/programs/mythbackend/upnpcdsvideo.cpp