merge http://sourceforge.net/p/me722-cm/code/

Change-Id: I3bb707db65a0a269a188a3230ff0a0e9c9ba6781