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

[Jussi Lehtola]

commit 0bea0853d851fe9d825b0837279049bd95cfef46
Merge: 05bb234 1dd0d96
Author: Jussi Lehtola <jussilehtola at fedoraproject.org>
Date:   Mon Sep 17 20:05:23 2012 +0300

    Merge branch 'master' into f16

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