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

[Michel Alexandre Salim]

commit 64fdd4ab23a0a87311da888a3d3c31a192dfa4e8
Merge: 2283172 6669555
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Fri Mar 18 21:49:19 2011 +0100

    Merge branch 'master' into f13

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