Merged revision(s) 2740 from trunk:A3300 updates from nafraf:http://chdk.setepontos.com/index.php?topic=650.msg99955#msg99955