[berusky2-data/f16: 6/6] Merge branch 'master' into f16

[Martin Stransky]

commit d54ac852263d621f0244acec8143c477f9e1662f
Merge: 54628ae 46b1754
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Feb 24 23:17:38 2013 +0100

    Merge branch 'master' into f16

 .gitignore         |    1 +
 berusky2-data.spec |   14 +++++++++++++-
 sources            |    2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)
---