[dmlite-plugins-profiler/f19: 5/5] Merge branch 'master' into f19

[Devresse]

commit 9c7527ecacff5aff74d478531ae1c8f806219c70
Merge: 49035e9 36778be
Author: Adrien Devresse <adrien.devresse at cern.ch>
Date:   Wed Mar 12 16:53:56 2014 +0100

    Merge branch 'master' into f19

 .gitignore                   |    1 +
 dmlite-plugins-profiler.spec |   22 +++++++++++++++++++---
 sources                      |    2 +-
 3 files changed, 21 insertions(+), 4 deletions(-)
---