[berusky2/f16: 5/5] Merge branch 'f15' into f16

[Martin Stransky]

commit 888f0bdb20cc23baddbab741a05c1ba8c85a9194
Merge: 664ff3a 55007f9
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Wed Mar 28 23:49:38 2012 +0200

    Merge branch 'f15' into f16

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