Ricky Ng-Adam - 2008-09-17

patch for CVS emma project in diff -u format