[bti/el6/master: 3/3] Merge branch 'master' into el6

[Michel Alexandre Salim]

commit 1e34941cc4de6c359f76a1b82776444954e970b8
Merge: ff0a129 c66d6ab
Author: Michel Alexandre Salim <michel at sylvestre.me>
Date:   Wed Mar 23 00:46:28 2011 +0100

    Merge branch 'master' into el6

 .gitignore                   |    2 +-
 bti-028-readline5.patch      |   11 -----------
 bti-030-comment_marker.patch |   34 ----------------------------------
 bti.spec                     |   28 +++++++++++++---------------
 sources                      |    2 +-
 5 files changed, 15 insertions(+), 62 deletions(-)
---