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

[Martin Stransky]

commit 0f32d2c5e31eb17ba520a0feebd07ba8b22c47b6
Merge: 5f518f9 d062ecd
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Mon Mar 5 10:08:34 2012 +0100

    Merge branch 'master' into f15

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