fixed display of merged nodes in profiler

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3980 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/Profiler/Controller/Data/SQLiteCallTreeNode.cs

@@ -42,6 +42,9 @@ namespace ICSharpCode.Profiler.Controller.Data
 		/// </summary>
 		public override NameMapping NameMapping {
 			get {
+				if (nameId == 0)
+					return new NameMapping(0, null, "Merged node", null);
+				
 				return this.provider.GetMapping(nameId);
 			}
 		}

src/AddIns/Misc/Profiler/Frontend/AddIn/ICSharpCode.Profiler.AddIn.addin

@@ -41,7 +41,7 @@
 			class="ICSharpCode.Profiler.AddIn.Commands.GoToDefinition" />
 		<MenuItem
 			id="SetAsRoot"
-			label="Set as root"
+			label="Set as root/Merge"
 			class="ICSharpCode.Profiler.AddIn.Commands.SetAsRoot" />
 		<MenuItem
 			id="FindCallsOfSelected"