[xlockmore/el6: 2/2] Merge branch 'master' into el6

[Adrian Reber]

commit d142d6a97b22f679dc24ed6ee3d7436a54f529e7
Merge: 93b3318 8628361
Author: Adrian Reber <adrian at lisas.de>
Date:   Mon Oct 22 11:20:29 2012 +0200

    Merge branch 'master' into el6

 xlockmore.spec |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)
---