cc5b95c update to latest HEAD.

Authored and Committed by James Antill 11 years ago
    update to latest HEAD.
    
    - Use .ui_id explicitly for backcompat. on strings, *sigh*.
    
        
file modified
+235 -93
file modified
+5 -1