4de8808 - Merge from OLPC-4 branch

Authored and Committed by pbrobinson 15 years ago
    - Merge from OLPC-4 branch
    
        
file modified
+14 -3
file modified
+1 -2