Merged revision(s) 2738 from trunk:A3100 updates from srsa_4c:http://chdk.setepontos.com/index.php?topic=650.msg99942#msg99942