Merged revision(s) 2725-2726 from trunk:G15 1.00b port from c10ud:
http://chdk.setepontos.com/index.php?topic=650.msg99631#msg99631