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

[jamatos]

commit 44cdb5148e3d6892a8f8bbf141e592df0f136183
Merge: bf41bf2 8dd7978
Author: José Matos <jamatos at fedoraproject.org>
Date:   Fri Dec 2 01:17:42 2011 +0000

    Merge branch 'master' into f16
    
    Update to new upstream (bugfix) release.
    
    Conflicts:
    	tellico.spec

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