[lis/el6: 7/7] Merge branch 'master' into el6

[Jussi Lehtola]

commit 09a65cd5fa7d81d665060a771744ca320793d51f
Merge: c64b18d 1dd0d96
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Sep 17 20:22:16 2012 +0300

    Merge branch 'master' into el6

 .gitignore |    1 +
 lis.spec   |   40 +++++++++++++++++++++++++++++++++++++---
 sources    |    2 +-
 3 files changed, 39 insertions(+), 4 deletions(-)
---