[yasm/el5: 21/21] Merge branch 'master' into el5

[Matthias Saou]

commit 5fae41910c1b921ebaf926f2491cc40211be2ef4
Merge: 6f07421 3f37615
Author: Matthias Saou <matthias at saou.eu>
Date:   Thu Mar 15 14:16:54 2012 +0100

    Merge branch 'master' into el5

 .gitignore |    4 ++-
 sources    |    2 +-
 yasm.spec  |   68 +++++++++++++++++++++++++++++++++++++++++++++++------------
 3 files changed, 58 insertions(+), 16 deletions(-)
---