Merge remote-tracking branch 'mel/release/2014.05' into sync-from-2014.05
Merge pull request #42 from drewmoseley/sync-from-2014.05

Sync from 2014.05
Merge remote-tracking branch 'origin/daisy'

* origin/daisy:
lttng-modules: drop now-unnecessary bbappend

Signed-off-by: Christopher Larson <chris_larson@mentor.com>