[turba/f13/master: 5/5] Merge branch 'master' into f13

[Nick Bebout]

commit af2e89dc6ee8b86a01175a949e1933ec0c23670d
Merge: 9d70c3a e4bc2a0
Author: Nick Bebout <nb at fedoraproject.org>
Date:   Wed Feb 9 21:16:34 2011 +0000

    Merge branch 'master' into f13
    
    Conflicts:
    	.gitignore
    	sources
    	turba.spec

 .gitignore |    1 +
 sources    |    2 +-
 turba.spec |    5 ++++-
 3 files changed, 6 insertions(+), 2 deletions(-)
---