[SCM] yafaray-exporter/master: Merge remote-tracking branch 'origin/master'

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d3fc64e867c56fd4299a96369a8b182907bda6e9
Merge: 0630615e001168ba05227d35188a9ba96f9440e8 a1b4181ad69f9bb86a608fafdcd208c6f668efb3
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 9 15:51:13 2012 +0100

    Merge remote-tracking branch 'origin/master'


-- 
yafaray-exporter packaging