[mythtv-firehose] mythtv/devel/action-redo commit: f62e2d6c0 by Gavin Hurlbut (Beirdo)

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2012-03-17T18:42:16-07:00
   Push Date:  2012/04/10 00:41:52 -0700
  Repository:  mythtv
      Branch:  devel/action-redo
New Revision:  f62e2d6c06054712d3d15380373238a490918729
   Changeset:  https://github.com/MythTV/mythtv/commit/f62e2d6c0

Log:

Merge branch 'instrument-keypress' into action-redo

Conflicts:
	mythtv/libs/libmythtv/tv_play.cpp

Modified:

   mythtv/libs/libmythtv/tv_play.cpp