a495 updates from nafraf in http://chdk.setepontos.com/index.php?topic=650.msg104469#msg104469 - trunk r3043