Merged revision(s) 2705 from trunk:S100 update from c10ud:http://chdk.setepontos.com/index.php?topic=650.msg99412#msg99412