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

[MythTV]

      Author:  Gavin Hurlbut <ghurlbut at mythtv.org>
 Change Date:  2012-03-17T16:11:49-07:00
   Push Date:  2012/04/10 00:41:52 -0700
  Repository:  mythtv
      Branch:  devel/action-redo
New Revision:  55f13bcf5cc2e3a805a18128bebe570d744c9730
   Changeset:  https://github.com/MythTV/mythtv/commit/55f13bcf5

Log:

Merge branch 'instrument-keypress' into action-redo

Conflicts:
	mythtv/libs/libmythtv/tv_play.cpp

Modified:

   mythtv/libs/libmythtv/tv_play.cpp