fix very ugly email merge.  maybe next time ill look at what is happening

Change-Id: I28c9b0e4552d7c2b582dd2092f9afb5b6b6beb70
Signed-off-by: scott <scott@ubuntu.com>