[tellico/f14/master: 15/15] Merge branch 'master' into f14

[alexlan]

commit ccd07a565c9240bfd46e9d7077d3b57a6b85dafd
Merge: 7e87dfd ebdb6cf
Author: Alex Lancaster <alexlan at fedoraproject.org>
Date:   Thu Aug 26 13:18:26 2010 -0400

    Merge branch 'master' into f14
    
    Conflicts:
    	tellico.spec

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