[blender/f17: 3/3] Merge branch 'master' into f17

[Jochen Schmitt]

commit 96dc85bff8d633803c21bb69ba10fb8e4fb1f475
Merge: f61b953 90a7e62
Author: Jochen Schmitt <Jochen at herr-schmitt.de>
Date:   Sat Apr 28 21:59:31 2012 +0200

    Merge branch 'master' into f17

 .gitignore                 |    1 +
 blender-2.61-gcc47.patch   |   48 ---------------------------------
 blender-2.61-syspath.patch |   51 -----------------------------------
 blender-2.62-ndof.patch    |   52 -----------------------------------
 blender-2.63-syspath.patch |   64 ++++++++++++++++++++++++++++++++++++++++++++
 blender.spec               |   20 ++++++-------
 sources                    |    2 +-
 7 files changed, 75 insertions(+), 163 deletions(-)
---