[bti/el5/master: 19/23] Merge commit '834a7c34f60be65b1ebf87935f41ed74eea8f4bf' into el5

[Michel Alexandre Salim]

commit add62fbfc9333ca17a78fa7552bfcdb28c6ff03c
Merge: 103a163 834a7c3
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Sep 16 12:29:47 2010 +0200

    Merge commit '834a7c34f60be65b1ebf87935f41ed74eea8f4bf' into el5
    
    Conflicts:
    	bti.spec

 bti-026-readline5.patch |   20 ++++++++++++++++++++
 bti.spec                |    6 ++++--
 2 files changed, 24 insertions(+), 2 deletions(-)
---