Index: libs/libmythtv/tv_play.h
===================================================================
--- libs/libmythtv/tv_play.h	(revision 16437)
+++ libs/libmythtv/tv_play.h	(working copy)
@@ -221,7 +221,7 @@
     void SetCurrentlyPlaying(ProgramInfo *pginfo);
 
     void GetNextProgram(RemoteEncoder *enc, int direction,
-                        InfoMap &infoMap);
+                        InfoMap &infoMap) const;
 
     // static functions
     static void InitKeys(void);
@@ -399,6 +399,11 @@
     void ToggleRecord(void);
     void BrowseChannel(const QString &channum);
 
+    uint    GetChanIDAnyTuner(const QString &chan) const;
+    QString GetChanNumAnyTuner(const uint &chanid) const;
+    void    GetNextProgramAnyTuner(int direction, InfoMap &infoMap,
+                                   ProgramInfo *prog) const;
+
     void DoTogglePictureAttribute(PictureAdjustType type);
     void DoChangePictureAttribute(
         PictureAdjustType type, PictureAttribute attr, bool up);
@@ -586,6 +591,8 @@
     QString browsechannum;
     QString browsechanid;
     QString browsestarttime;
+    bool browsealltuners;
+    DBChanList allchannels;   
 
     // Program Info for currently playing video
     // (or next video if InChangeState() is true)
Index: libs/libmythtv/tv_play.cpp
===================================================================
--- libs/libmythtv/tv_play.cpp	(revision 16437)
+++ libs/libmythtv/tv_play.cpp	(working copy)
@@ -586,6 +586,7 @@
       browsemode(false), persistentbrowsemode(false),
       browseTimer(new QTimer(this)),
       browsechannum(""), browsechanid(""), browsestarttime(""),
+      browsealltuners(false),
       // Program Info for currently playing video
       recorderPlaybackInfo(NULL),
       playbackinfo(NULL), playbackLen(0),
@@ -675,6 +676,14 @@
         ff_rew_speeds.push_back(
             gContext->GetNumSetting(QString("FFRewSpeed%1").arg(i), def[i]));
 
+    browsealltuners = gContext->GetNumSetting("BrowseAllTuners", 0);
+    if (browsealltuners)
+    {
+        QString channelOrdering = gContext->GetSetting("ChannelOrdering", "channum");
+        allchannels = ChannelUtil::GetChannels(0, true, "channum, callsign");
+        ChannelUtil::SortChannels(allchannels, channelOrdering, true);
+    };
+
     vbimode = VBIMode::Parse(gContext->GetSetting("VbiFormat"));
 
     if (createWindow)
@@ -5618,7 +5627,7 @@
  *  \param infoMap InfoMap to fill in with returned data
  */
 void TV::GetNextProgram(RemoteEncoder *enc, int direction,
-                        InfoMap &infoMap)
+                        InfoMap &infoMap) const
 { 
     QString title, subtitle, desc, category, endtime, callsign, iconpath;
     QDateTime begts, endts;
@@ -5772,6 +5781,85 @@
     is_tunable_cache_inputs.clear();
 }
 
+uint TV::GetChanIDAnyTuner(const QString &chan) const
+{
+    for (uint i = 0; i < allchannels.size(); ++i)
+        if (allchannels[i].channum == chan)
+            return allchannels[i].chanid;
+    return 0;
+}
+
+QString TV::GetChanNumAnyTuner(const uint &chanid) const
+{
+    for (uint i = 0; i < allchannels.size(); ++i)
+        if (allchannels[i].chanid == chanid)
+            return allchannels[i].channum;
+    return "";
+}
+
+void TV::GetNextProgramAnyTuner(int direction, InfoMap &infoMap,
+                                ProgramInfo *prog) const
+{ 
+    uint chanid = infoMap["chanid"].toUInt();
+    if (!chanid)
+        chanid = GetChanIDAnyTuner(infoMap["channum"]);
+        
+    int chandir = -1;
+    switch(direction)
+    {
+        case BROWSE_UP:          chandir = CHANNEL_DIRECTION_UP;         break;
+        case BROWSE_DOWN:        chandir = CHANNEL_DIRECTION_DOWN;       break;
+        case BROWSE_FAVORITE:    chandir = CHANNEL_DIRECTION_FAVORITE;   break;
+    };
+    if (direction != -1)
+        chanid = ChannelUtil::GetNextChannel(allchannels, chanid, 0, chandir);
+
+    infoMap["chanid"] = QString("%1").arg(chanid);
+    infoMap["channum"] = GetChanNumAnyTuner(chanid);
+
+    QDateTime nowtime = QDateTime::currentDateTime();
+    QDateTime latesttime = nowtime.addSecs(6*60*60);
+    QDateTime browsetime = QDateTime::fromString(infoMap["dbstarttime"], Qt::ISODate);
+
+    MSqlBindings bindings;
+    bindings[":CHANID"] = chanid;
+    bindings[":NOWTS"] = nowtime.toString("yyyy-MM-ddThh:mm:ss");
+    bindings[":LATESTTS"] = latesttime.toString("yyyy-MM-ddThh:mm:ss");
+    bindings[":BROWSETS"] = browsetime.toString("yyyy-MM-ddThh:mm:ss");
+
+    QString querystr = " WHERE program.chanid = :CHANID ";
+    switch(direction)
+    {
+        case BROWSE_LEFT:
+                querystr += " AND program.endtime <= :BROWSETS "
+                            " AND program.endtime > :NOWTS ";
+                break;
+
+        case BROWSE_RIGHT:
+                querystr += " AND program.starttime > :BROWSETS "
+                            " AND program.starttime < :LATESTTS ";
+                break;
+            
+        default:
+                querystr += " AND program.starttime <= :BROWSETS "
+                            " AND program.endtime > :BROWSETS ";
+    };
+
+    ProgramList progList;
+    progList.FromProgram(querystr, bindings);
+    
+    if (progList.isEmpty())
+    {
+        infoMap["dbstarttime"] = "";
+        return;
+    };
+
+    prog = (direction == BROWSE_LEFT) ? progList.take(progList.count() - 1)
+                                      : progList.take(0);
+    
+    infoMap["dbstarttime"] = prog->startts.toString(Qt::ISODate);
+}
+
 void TV::EmbedOutput(WId wid, int x, int y, int w, int h)
 {
     embedWinID = wid;
@@ -6602,7 +6690,11 @@
     infoMap["channum"]     = browsechannum;
     infoMap["chanid"]      = browsechanid;
     
-    GetNextProgram(activerecorder, direction, infoMap);
+    ProgramInfo *program_info = NULL;
+    if (browsealltuners)
+        GetNextProgramAnyTuner(direction, infoMap, program_info);
+    else
+        GetNextProgram(activerecorder, direction, infoMap);
     
     browsechannum = infoMap["channum"];
     browsechanid  = infoMap["chanid"];
@@ -6613,13 +6705,19 @@
         browsestarttime = infoMap["dbstarttime"];
     }
 
-    QDateTime startts = QDateTime::fromString(browsestarttime, Qt::ISODate);
-    ProgramInfo *program_info = 
-        ProgramInfo::GetProgramAtDateTime(browsechanid, startts);
+    if (!program_info)
+    {
+        QDateTime startts = QDateTime::fromString(browsestarttime, Qt::ISODate);
+        program_info =
+            ProgramInfo::GetProgramAtDateTime(browsechanid, startts);
+    }
     
     if (program_info)
         program_info->ToMap(infoMap);
 
+    if (browsealltuners && !IsTunable(browsechanid.toUInt()))
+        infoMap["channum"] = "x" + infoMap["channum"];
+    
     GetOSD()->ClearAllText("browse_info");
     GetOSD()->SetText("browse_info", infoMap, -1);
 
@@ -6717,7 +6815,12 @@
 
 void TV::BrowseChannel(const QString &chan)
 {
-    if (!activerecorder->CheckChannel(chan))
+    if (browsealltuners)
+    {
+        if (!GetChanIDAnyTuner(chan))
+            return;
+    } 
+    else if (!activerecorder->CheckChannel(chan))
         return;
 
     browsechannum = chan;
Index: programs/mythfrontend/globalsettings.cpp
===================================================================
--- programs/mythfrontend/globalsettings.cpp	(revision 16437)
+++ programs/mythfrontend/globalsettings.cpp	(working copy)
@@ -1913,6 +1913,18 @@
     return gc;
 }
 
+static HostCheckBox *BrowseAllTuners()
+{
+    HostCheckBox *gc = new HostCheckBox("BrowseAllTuners");
+    gc->setLabel(QObject::tr("Browse channels from all tuners"));
+    gc->setValue(true);
+    gc->setHelpText(QObject::tr("By default, browse mode only shows channels "
+                    "on the currently active tuner. If enabled, browse mode "
+                    "will shows all channels, no matter what tuner they "
+                    "exist on."));
+    return gc;
+}
+
 static HostCheckBox *AggressiveBuffer()
 {
     HostCheckBox *gc = new HostCheckBox("AggressiveSoundcardBuffer");
@@ -4701,6 +4713,7 @@
     osd->addChild(OSDThemeFontSizeType());
     osd->addChild(EnableMHEG());
     osd->addChild(PersistentBrowseMode());
+    osd->addChild(BrowseAllTuners());
     addChild(osd);
 
     VerticalConfigurationGroup *udp = new VerticalConfigurationGroup(false);