[SCM] supercollider/master: Merge commit 'upstream/3.5.4_repack-2'

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

Imported Upstream version 3.5.4~repack-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: ff1141726b49909d8a472acb66156abb29c4a5de
X-Git-Newrev: aa0577ab17690e84a4cec4f3e57de4cfa51ffb83

The following commit has been merged in the master branch:
commit 820b7512cbc1ca7f174e820a9e44b165c7f73745
Merge: f63dfb47f2bd763f78924ef8516ed9c192d81a7e 2f8347e45431ccb4c2efd5ad81df486eefc2c610
Author: Dan Stowell <danstowell at users.sourceforge.net>
Date:   Mon Aug 13 09:04:19 2012 +0100

    Merge commit 'upstream/3.5.4_repack-2'


-- 
supercollider packaging