[bti/el5/master: 22/23] Merge branch 'master' into el5

[Michel Alexandre Salim]

commit 5fef5e1bb15ca22d472e08ccb45e91e6305bae30
Merge: cbb0514 01a9e83
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Sep 16 12:41:13 2010 +0200

    Merge branch 'master' into el5

 bti.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---