DESCRIPTION

Fix conflicting and add missing mnemonics

Change-Id: I437028cf6db80b6899979a2a679d78009e9b1b91
Signed-off-by: Sebastian Porter xxx@xxx.xxx

COMMENTS

author: Brenden Conley
date: 2012-09-03 13:23:50.000000000

Patch Set 1:

Build Started https://hudson.eclipse.org/sandbox/job/egit.gerrit/3350/ 

-------------------------------------
author: Sebastian Porter
date: 2012-09-03 13:25:03.000000000

Patch Set 1: Verified; Looks good to me, approved; IP review completed

Submitting this trivial change.

-------------------------------------
author: Sebastian Porter
date: 2012-09-03 13:25:09.000000000

Change has been successfully merged into the git repository.

-------------------------------------
