[SCM] Atari 2600 Emulator for SDL & the X Window System branch, master, updated. debian/3.4.1-2-4-g124e4d4

[Stephen Kitt]

The following commit has been merged in the master branch:
commit 1e581b6d5bf48d50e1d3c56e25ae5bdc2422a81e
Merge: 06f3748067db453975d2102a0af7c8d3092a2b95 5023da35ed2ffaf7170fdba0b48162f5daa1ac92
Author: Stephen Kitt <steve at sk2.org>
Date:   Thu Dec 29 23:36:11 2011 +0100

    Merge commit 'upstream/3.5'
    
    Conflicts:
    	debian/changelog


-- 
Atari 2600 Emulator for SDL & the X Window System