Merged revision(s) 2820 from trunk:A495 updates from nafraf:http://chdk.setepontos.com/index.php?topic=650.msg101102#msg101102