[berusky2/f16: 2/2] Merge branch 'master' into f16

[Martin Stransky]

commit 664ff3a1f646774f856454e8232da21829c087cc
Merge: b8724d6 d062ecd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Mar 5 09:52:45 2012 +0100

    Merge branch 'master' into f16

 .gitignore    |    1 +
 berusky2.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---