From: Bernd Hufmann Date: Fri, 16 Mar 2012 19:11:36 +0000 (-0400) Subject: Merge branch 'master' into lttng_2_0_control_dev X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=1a681429671511f685af329012c47b8727547778;p=deliverable%2Ftracecompass.git Merge branch 'master' into lttng_2_0_control_dev --- 1a681429671511f685af329012c47b8727547778