[berusky2/f17: 14/14] merge fix

[Martin Stransky]

commit 8a35c2c3b194d5441cca0490442803c589dbd073
Merge: 44ffcdc 595369e
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Feb 24 21:51:38 2013 +0100

    merge fix

 .gitignore    |    2 ++
 berusky2.spec |    9 ++++++---
 sources       |    2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
---