Append END as user olpc
Merge commit 'e9b773133efae79b42c161583da1bd0f4fcd1cb7' into dextrose