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

[Michel Alexandre Salim]

commit cc95a5542c435f7dc67d5e915eb4b4f5d8291443
Merge: 1c7f637 f21c1a1
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 16:06:25 2011 +0100

    Merge branch 'master' into f14

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