Merge OLPC changes