[llvm/el6/master: 4/4] Merge branch 'f15' into el6

[Michel Alexandre Salim]

commit 9b6bd7fef231cbefaf864ef3464f9857c783110e
Merge: 7b281c3 2fc8420
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Mar 17 20:24:26 2011 +0100

    Merge branch 'f15' into el6

 llvm.spec |   37 +++++++++++++++++++++++++++++--------
 1 files changed, 29 insertions(+), 8 deletions(-)
---