[llvm/f14/master: 3/3] Merge branch 'master' into f14

[Dennis Gilmore]

commit 79d29c4d2b8cae9452d2c26445dbcf24393d3f19
Merge: 57df0cc 6668812
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Wed Sep 15 09:32:59 2010 -0500

    Merge branch 'master' into f14
    
    Conflicts:
    	llvm.spec

 llvm.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---