Merge branch 'master' into lttng-luna

Conflicts:
	lttng/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
	lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/internal/tmf/ui/project/handlers/DeleteTraceHandler.java
	lttng/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java

Change-Id: I06c617e5e9ec6e691592971f9fc78812751623c8

diff --cc org.eclipse.linuxtools.lttng.help/doc/User-Guide.mediawiki
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
index d8878da334eaf75f774a92ac79abc9c64309a495,9bda17fc6f5c02f7863ff255f69b59f5ec47e723..0bd681838a56981279098e77bb76a101c895751a
--- 1/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
--- 2/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
+++ b/org.eclipse.linuxtools.tmf.ui/META-INF/MANIFEST.MF
@@@ -26,7 -26,8 +26,9 @@@ Export-Package: org.eclipse.linuxtools.
   org.eclipse.linuxtools.internal.tmf.ui.project.dialogs;x-internal:=true,
   org.eclipse.linuxtools.internal.tmf.ui.project.handlers;x-internal:=true,
   org.eclipse.linuxtools.internal.tmf.ui.project.model;x-friends:="org.eclipse.linuxtools.lttng2.ui,org.eclipse.linuxtools.tmf.ui.tests",
+  org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg;x-internal:=true,
+  org.eclipse.linuxtools.internal.tmf.ui.project.wizards.tracepkg.importexport;x-internal:=true,
 + org.eclipse.linuxtools.tmf.ui.analysis,
   org.eclipse.linuxtools.tmf.ui.editors,
   org.eclipse.linuxtools.tmf.ui.project.model,
   org.eclipse.linuxtools.tmf.ui.project.wizards,

diff --cc org.eclipse.linuxtools.tmf.ui/plugin.properties
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/plugin.xml
Simple merge

diff --cc org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
index 1f17f243dc27014e2c11b709763654e58e7ed200,60f09c338c4c74c5a9d98487a0968a6112d96e41..398291c3e56ca441b1a753cc92b7cc4466b57aa8
--- 1/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
--- 2/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
+++ b/org.eclipse.linuxtools.tmf.ui/src/org/eclipse/linuxtools/tmf/ui/project/model/TmfTraceElement.java
@@@ -20,9 -20,9 +20,10 @@@ package org.eclipse.linuxtools.tmf.ui.p
  
  import java.io.ByteArrayInputStream;
  import java.io.InputStream;
 +import java.util.ArrayList;
  import java.util.Arrays;
  import java.util.HashMap;
+ import java.util.LinkedList;
  import java.util.List;
  import java.util.Map;