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

[Adrian Reber]

commit c597ab07abbb29b08f2f3dc8b38801cdc6b610eb
Merge: d142d6a 4698a17
Author: Adrian Reber <adrian at lisas.de>
Date:   Tue Nov 20 22:18:15 2012 +0100

    Merge branch 'master' into el6

 .gitignore                        |    1 +
 sources                           |    2 +-
 xlockmore-5.40-fix_exitcode.patch |   34 ++++++++++++++++++++++++++++++++++
 xlockmore.spec                    |   13 +++++++++----
 4 files changed, 45 insertions(+), 5 deletions(-)
---