[libcomps/f19: 4/4] Merge branch 'master' into f19

[Jindrich Luza]

commit cd9db1e6fe6558c53b6b3d836bb16c290b13a4fc
Merge: 8aaaf55 49f9679
Author: Jindrich Luza <jluza at redhat.com>
Date:   Fri Sep 6 14:38:36 2013 +0200

    Merge branch 'master' into f19

 .gitignore    |    3 +++
 libcomps.spec |   17 ++++++++++++-----
 sources       |    2 +-
 3 files changed, 16 insertions(+), 6 deletions(-)
---
diff --cc .gitignore
index b1e989b,f8aa934..3607bce
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,9 +1,4 @@@
 -/libcomps-257459634117baa067c3dde2a8ea83def6851094.tar.gz
 -<<<<<<< HEAD
 -=======
 -/libcomps-4951a3ec8b8e9a210471c4d42be370a310cc78ab.tar.gz
 ->>>>>>> master
  /libcomps-44ee40c5d69f53c0b0707c502fbcfff0c9acf8ec.tar.gz
+ /libcomps-36336e79a2b08cd7507c90f5df5b7f850058fef7.tar.gz
+ /libcomps-a054fcfde528bb23fbab7a24b4938b7c86ecc7ce.tar.gz
+ /libcomps-951226b59c6915de5b44fac79a84f42d5277a8bc.tar.gz