[bti/f14/master: 23/23] Merge branch 'master' into f14

[Michel Alexandre Salim]

commit 1c7f6372bba39e6db9df0cb782726084939d4744
Merge: ec172c4 a0b7be3
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Sat Mar 12 23:21:29 2011 +0100

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

 .gitignore    |    2 +-
 README.Fedora |   10 +++-------
 bti.spec      |   27 ++++++++++++++++++++++-----
 sources       |    2 +-
 4 files changed, 27 insertions(+), 14 deletions(-)
---