[yasm/el6: 10/10] Merge branch 'master' into el6

[Matthias Saou]

commit 7b05f40db72b687044befaf6ca8f300faeb3cd3a
Merge: 367bc28 3f37615
Author: Matthias Saou <matthias at saou.eu>
Date:   Thu Mar 15 14:14:23 2012 +0100

    Merge branch 'master' into el6

 sources   |    2 +-
 yasm.spec |   44 +++++++++++++++++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 8 deletions(-)
---