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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2011-05-28T00:49:39-07:00
   Push Date:  2011/05/28 00:49:53 -0700
  Repository:  mythtv
      Branch:  new-logging
New Revision:  af3f27d658fc5cbb8cb9069c3df3a07c755afbf1
   Changeset:  https://github.com/MythTV/mythtv/commit/af3f27d65

Log:

Merge branch 'master' into new-logging

Conflicts:
	mythtv/libs/libmythui/mythuiimage.cpp

Modified:

   mythtv/bindings/python/MythTV/methodheap.py
   mythtv/libs/libmythbase/mythdbcon.cpp