[SCM] blender/master: Merge commit 'upstream/2.61'

[alessio at users.alioth.debian.org]

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

The following commit has been merged in the master branch:
commit ffefd10943357640506d7f8232d847336e5c7472
Merge: b9c309e98924ced36e5181c60a0e5d484cdd542d b8eae8cd0e3dada94b34eb721c4f0cead2cdbd15
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Dec 31 13:08:56 2011 +0100

    Merge commit 'upstream/2.61'


-- 
blender packaging