[berusky-data/f18: 4/4] Merge with master

[Martin Stransky]

commit 6dbba171b1839f4a04e07c123606883bed66b453
Merge: 56e330e 8cd339c
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Apr 7 10:58:52 2013 +0200

    Merge with master

 .gitignore        |    2 ++
 berusky-data.spec |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)
---