[lis/f16: 2/2] Merge branch 'master' into f16

[Jussi Lehtola]

commit 05bb23492736b9bac4db2f98bfbc08c98e8afbfe
Merge: c5af61e 6430e48
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Tue Jun 26 22:13:25 2012 +0300

    Merge branch 'master' into f16

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