[LuxRender/f16: 11/11] Merge branch 'master' into f16

[Nicolas Chauvet]

commit d562abeae81c50e40110e19c1e1773de1ddaa132
Merge: b8d8b07 a188a00
Author: kwizart <kwizart at kwizart-exopc.home>
Date:   Mon Aug 15 00:01:22 2011 +0200

    Merge branch 'master' into f16
    
    Conflicts:
    	LuxRender.spec

 LuxRender.spec |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)
---