[SCM] multi-platform emulator, including NES, GB/A, Lynx, PC Engine branch, master, updated. upstream/0.8.C-15-gc231326

[Stephen Kitt]

The following commit has been merged in the master branch:
commit c231326e981cbb37827d938a9d2b03ca21e8f044
Merge: fd2cc97196e4556f32af17c45f7fb7afec155615 435d1070f466f7cfe2ebdb3c23699917307f420d
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon May 31 09:43:29 2010 +0200

    Merge commit 'upstream/0.8.D'


-- 
multi-platform emulator, including NES, GB/A, Lynx, PC Engine