114c33f sync from OLPC-2

Authored and Committed by ausil 16 years ago
    sync from OLPC-2
    
        
file added
+94
file modified
+1 -0