mend

Updated with changes from Omapzoom.

Signed-off-by: David Rodero <david@codiguiel.net>