[SCM] general-purpose neural simulator branch, master, updated. upstream/2.3-16-ga91a97a

[Gabriele Giacone]

The following commit has been merged in the master branch:
commit d997e70b101ee85c329419bb6929afd887d33fa3
Merge: e44c848ffd0bf0cf879404cd9ae39e2a9b2dda7d 8a5402ed026c36c24d1d4247cac54ebd481ba753
Author: Gabriele Giacone <1o5g4r8o at gmail.com>
Date:   Sat Dec 10 17:24:06 2011 +0100

    Merge commit 'upstream/2.3+dfsg'


-- 
general-purpose neural simulator