[mythtv-firehose] mythtv/mythtv-rec2 commit: c414de813 by Daniel Kristjansson (daniel-kristjansson)

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-06-17T10:44:12-07:00
   Push Date:  2011/06/17 10:44:28 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  c414de8136a3a97d7673d741e85c19d427923a8e
   Changeset:  https://github.com/MythTV/mythtv/commit/c414de813

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/programs/mythbackend/main_helpers.h