Skip to content
Merge from branch to fix bug.

llvm-svn: 46994

--
SVN tag also included these previous commits:

Author: Tanya Lattner <tonic@nondot.org>
Date: Tue Feb 12 05:19:29 2008 +0000

    Tagging release 2.2.
    
    llvm-svn: 46987