[llvm/f13/master: 6/6] Merge branch 'f14' into f13

[Michel Alexandre Salim]

commit e7a823e4e2df7e6fbd049bbea93dcb799ad1eab7
Merge: faa2645 bbe1677
Author: Michel Alexandre Salim <salimma at fedoraproject.org>
Date:   Thu Nov 11 17:59:59 2010 +0100

    Merge branch 'f14' into f13

 .gitignore |    4 ++--
 llvm.spec  |   25 ++++++++++++-------------
 sources    |    4 ++--
 3 files changed, 16 insertions(+), 17 deletions(-)
---