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

[Michel Alexandre Salim]

commit 7e9e3a4cf513a244ab8fa27eee0df896af6e27a2
Merge: 34f2486 c66d6ab
Author: Michel Alexandre Salim <michel at sylvestre.me>
Date:   Tue Mar 22 23:46:49 2011 +0100

    Merge branch 'master' into f14

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