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

[Michel Alexandre Salim]

commit f82fcdd7b9a87ca51d232a0dbdab9156fec4f33b
Merge: 64fdd4a c66d6ab
Author: Michel Alexandre Salim <michel at sylvestre.me>
Date:   Tue Mar 22 23:56:55 2011 +0100

    Merge branch 'master' into f13

 .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(-)
---