[SCM] supercollider/master: Merge branch 'upstream'

[danstowell-guest at users.alioth.debian.org]

Imported Upstream version 3.4.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: d2a3c14e33aab08167bd502f2577cf651bde5d55
X-Git-Newrev: b55141305c828a26904328139441c5b2c9793661

The following commit has been merged in the master branch:
commit 00e68a2ba4e32590928fb250f0fd18d32639dab8
Merge: d2a3c14e33aab08167bd502f2577cf651bde5d55 c0429f9dcde5196046775eedb8cdc54397d60130
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Fri Apr 15 13:07:49 2011 +0100

    Merge branch 'upstream'


-- 
supercollider packaging