[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.4-96-ga8385bb

[Christoph Egger]

The following commit has been merged in the master branch:
commit 7f7747805f3c025b6a97133cdbfa93bc05201e6f
Merge: 08ae76800de472b372216294212f5d551be72b4e 25177f23f35afa0e6ebdd63d581003c298d3a7df
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Tue Jun 16 11:59:06 2009 +0200

    Merge branch 'upstream'


-- 
Simple and fast multimedia library for C++