[tellico/f16: 5/5] Merge branch 'master' into f16

[jamatos]

commit 30511d5701f0b1f2fdc8c35997fdaa7359fdeaa6
Merge: 3bc3543 c2c513f
Author: José Matos <jamatos at fedoraproject.org>
Date:   Thu Jul 26 10:35:58 2012 +0100

    Merge branch 'master' into f16

 .gitignore   |    1 +
 sources      |    2 +-
 tellico.spec |   17 +++++++++++------
 3 files changed, 13 insertions(+), 7 deletions(-)
---