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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-28T23:43:25-07:00
   Push Date:  2011/05/28 23:43:41 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  4a7e83c76ddb46049f5974c6caab0bb42fa885c3
   Changeset:  https://github.com/MythTV/mythtv/commit/4a7e83c76

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythui/mythuiimage.cpp

Modified:

   mythplugins/mythmusic/mythmusic/shoutcast.h
   mythplugins/mythzoneminder/mythzmserver/zmserver.cpp
   mythtv/libs/libmythservicecontracts/datacontracts/settingList.h
   mythtv/libs/libmythservicecontracts/service.h
   mythtv/libs/libmythtv/avformatdecoder.cpp
   mythtv/libs/libmythui/mythuibuttonlist.cpp
   mythtv/libs/libmythupnp/serializers/xmlSerializer.cpp
   mythtv/libs/libmythupnp/wsdl.cpp
   mythtv/libs/libmythupnp/wsdl.h