[SCM] Emulator of the Super Nintendo Entertainment System (TM) branch, master, updated. upstream/1.510+bz2-61-g288d2b0

[Etienne Millon]

The following commit has been merged in the master branch:
commit 69fef2a3113da2a0c049e5853c1abc5f01d0b2ac
Merge: 7c09495090766da92f66ff6066d2275442946bab aff9dec84b9270601e1e322f237e7fb231286582
Author: Etienne Millon <etienne.millon at gmail.com>
Date:   Mon Apr 4 10:10:26 2011 +0200

    Merge commit 'upstream/1.510+bz2'


-- 
Emulator of the Super Nintendo Entertainment System (TM)