7028221 rebase to upstream bugfix release and revert dynamic compile patch as this

Authored and Committed by michaelc 13 years ago
    rebase to upstream bugfix release and revert dynamic compile patch as this
        is causing a regression for boot
    
        
file modified
+2 -0
file modified
+9 -5
file modified
+1 -1