Q2D12 - SVN 791 + cherry-picked 803 to fix JFFS2 problem (trac 6291) Same as Q2D11 except for the JFFS2 fix.