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

[Martin Stransky]

commit 2e4dab5a406f95077577de1b5e6d391c8e485a53
Merge: ae61c75 1082ae2
Author: Martin Stransky <stransky at anakreon.cz>
Date:   Sun Feb 24 21:53:52 2013 +0100

    Merge branch 'master' into f18

 berusky2.spec |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---