Index: gtk2_ardour/route_time_axis.cc
===================================================================
--- gtk2_ardour/route_time_axis.cc	(revision 11896)
+++ gtk2_ardour/route_time_axis.cc	(working copy)
@@ -190,6 +190,11 @@
                 }
 
 		rec_enable_button->set_sensitive (_session->writable());
+		
+		// set playlist button tip to current playlist, and make it update when it changes
+		update_playlist_tip();
+		track()->PlaylistChanged.connect(*this, invalidator (*this), ui_bind(&RouteTimeAxisView::update_playlist_tip, this), gui_context());
+		
 	}
 	
 	controls_hbox.pack_start(gm.get_level_meter(), false, false);
@@ -209,7 +214,6 @@
 	ARDOUR_UI::instance()->set_tip(*solo_button,_("Solo"));
 	ARDOUR_UI::instance()->set_tip(*mute_button,_("Mute"));
 	ARDOUR_UI::instance()->set_tip(route_group_button, _("Route Group"));
-	ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist"));
 
 	if (is_midi_track()) {
 		ARDOUR_UI::instance()->set_tip(automation_button, _("MIDI Controllers and Automation"));
@@ -1578,6 +1582,31 @@
 }
 
 void
+RouteTimeAxisView::update_playlist_tip()
+{
+	RouteGroup* rg = route_group();
+	if (rg && rg->is_active() && rg->enabled_property (ARDOUR::Properties::edit.property_id)) {
+		std::string group_string = "." + rg->name() + ".";
+		
+		std::string take_name = track()->playlist()->name();
+		std::string::size_type idx = take_name.find(group_string);
+		
+		if (idx != std::string::npos) {
+			// find the bit containing the take number / name
+			take_name = take_name.substr(idx + group_string.length());
+
+			// set the playlist button tooltip to the take name
+			ARDOUR_UI::instance()->set_tip(playlist_button,string_compose(_("Take: %1.%2"), rg->name(), take_name));
+			return;
+		}
+	}
+	// set the playlist button tooltip to the playlist name
+	ARDOUR_UI::instance()->set_tip(playlist_button,_("Playlist") + std::string(":") + track()->playlist()->name());	
+
+}
+
+
+void
 RouteTimeAxisView::show_playlist_selector ()
 {
 	_editor.playlist_selector().show_for (this);
Index: gtk2_ardour/route_time_axis.h
===================================================================
--- gtk2_ardour/route_time_axis.h	(revision 11896)
+++ gtk2_ardour/route_time_axis.h	(working copy)
@@ -271,6 +271,7 @@
 	virtual Gtk::Menu* build_color_mode_menu() { return 0; }
 
 	void use_playlist (Gtk::RadioMenuItem *item, boost::weak_ptr<ARDOUR::Playlist> wpl);
+	void update_playlist_tip();
 
 	ArdourCanvas::SimpleRect* timestretch_rect;