DESCRIPTION

Merge branch 'master' into kepler

Conflicts:
	lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedDataRequest.java
	lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/internal/tmf/core/request/TmfCoalescedEventRequest.java
	lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/ITmfLostEvent.java
	lttng/org.eclipse.linuxtools.tmf.core/src/org/eclipse/linuxtools/tmf/core/event/TmfLostEvent.java

Change-Id: Ieb427c992b9e4284245369a72ba27c38c82ebcf0
Signed-off-by: Janet Compton xxx@xxx.xxx


COMMENTS

author: Janet Compton
date: 2012-08-09 21:18:57.000000000

Patch Set 1: Abandoned

Based on abandonned changes...

-------------------------------------
author: Janet Compton
date: 2012-08-09 21:20:37.000000000

Patch Set 1: Restored

-------------------------------------
author: Ricky Reeves
date: 2012-08-10 11:50:28.000000000

Patch Set 1: Verified; Looks good to me, but someone else must approve; IP review completed



-------------------------------------
author: Braxton Mccarthy
date: 2012-08-10 18:20:20.000000000

Patch Set 1: Do not submit

This was merged off-line.

-------------------------------------
author: Janet Compton
date: 2012-09-04 15:20:02.000000000

Patch Set 1: Abandoned

Already merged in master, lttng-kepler

-------------------------------------
