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

[Michel Alexandre Salim]

commit 22831724b83fddd80862f9604e51bc7dd2bb7b44
Merge: 856e0ba f21c1a1
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 16:11:41 2011 +0100

    Merge branch 'master' into f13

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