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

[jamatos]

commit 3bc3543729bfd4af0cdb6cd603f60be0922ad132
Merge: 44cdb51 3678c75
Author: José Matos <jamatos at fedoraproject.org>
Date:   Tue Mar 6 15:10:19 2012 +0000

    Merge branch 'master' into f16

 .gitignore   |    1 +
 sources      |    2 +-
 tellico.spec |   11 ++++++++++-
 3 files changed, 12 insertions(+), 2 deletions(-)
---