4d89618 update olpc branch to match fedora's updates

Authored and Committed by ausil 15 years ago
    update olpc branch to match fedora's updates
    
        
file modified
+40 -18