[babeltrace/f18: 10/10] Merge branch 'master' into f18

[Yannick Brosseau]

commit e27a7fb83604a4c94f0fb4f700d0c8ab9a34c270
Merge: eb868b3 4d41ae8
Author: Yannick Brosseau <yannick.brosseau at gmail.com>
Date:   Mon Jul 22 16:45:33 2013 -0400

    Merge branch 'master' into f18

 .gitignore      |    1 +
 babeltrace.spec |    5 ++++-
 sources         |    1 +
 3 files changed, 6 insertions(+), 1 deletions(-)
---
diff --cc sources
index cf19fd0,5de08e3..9dd30f2
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,2 @@@
 +58fdcb824a840d5cab82996da0c19901  babeltrace-1.1.0.tar.bz2
+ 15cf79cb2407a75874e41c9e7658f987  babeltrace-1.1.1.tar.bz2