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

[MythTV]

      Author:  Daniel Kristjansson <danielk at cuymedia.net>
 Change Date:  2011-07-28T09:26:28-07:00
   Push Date:  2011/07/28 09:26:41 -0700
  Repository:  mythtv
      Branch:  mythtv-rec2
New Revision:  65f36131637ad6869d53e0fefd8a270c7b4c711f
   Changeset:  https://github.com/MythTV/mythtv/commit/65f361316

Log:

Merge branch 'master' into mythtv-rec2

Conflicts:
	mythtv/programs/mythbackend/main_helpers.cpp
	mythtv/programs/mythbackend/mainserver.cpp

Modified:

   mythtv/programs/mythbackend/main_helpers.cpp
   mythtv/programs/mythbackend/mainserver.cpp
   mythtv/programs/mythbackend/scheduler.cpp
   mythtv/programs/mythbackend/scheduler.h