[SCM] yafaray/master: Merge commit 'upstream/0.1.2_beta2.1'

[mfv-guest at users.alioth.debian.org]

Imported Upstream version 0.1.2~beta2.1
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: f6f3dc22b245b314030b27470c063526d1bc17f9
X-Git-Newrev: 6d385a40ec3e4fd603077872967fecbb2ee75eab

The following commit has been merged in the master branch:
commit 623a634b17ee27900970905c581cbfd6d68db7a1
Merge: f6f3dc22b245b314030b27470c063526d1bc17f9 5f2a72a52cc97ce98f544d87f7dd633f2fd8285a
Author: Matteo F. Vescovi <mfv.debian at gmail.com>
Date:   Mon Jan 2 15:20:36 2012 +0100

    Merge commit 'upstream/0.1.2_beta2.1'


-- 
yafaray packaging