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

[Michel Alexandre Salim]

commit ff0a129e2fa970f2e48c989edd597185be44fd08
Merge: 02e078e 6669555
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 21:51:03 2011 +0100

    Merge branch 'master' into el6

 bti-030-comment_marker.patch |   34 ++++++++++++++++++++++++++++++++++
 bti.spec                     |    7 ++++++-
 2 files changed, 40 insertions(+), 1 deletions(-)
---