[berusky2-data/f16: 4/5] merge fixes

[Martin Stransky]

commit 2c7011cced4701848a3c8dec7910e9eceb591c25
Merge: 2bb10ae bd5e6a6
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Mar 4 22:22:48 2012 +0100

    merge fixes

 .gitignore         |    2 ++
 berusky2-data.spec |   12 ++++++++++--
 sources            |    4 ++++
 3 files changed, 16 insertions(+), 2 deletions(-)
---
diff --cc sources
index d32cb05,ed9cf33..4d1a993
--- a/sources
+++ b/sources
@@@ -1,1 -1,1 +1,5 @@@
++<<<<<<< HEAD
 +e8dac0afd3d185155cee2419b6cc318c  berusky2-data-0.5.tar.gz
++=======
+ 6072784a2c8bb51a45b6ead703d5264d  berusky2-data-0.6.tar.bz2
++>>>>>>> master