[SCM] libavc1394/master: Merge commit 'upstream/0.5.4'

[alessio at users.alioth.debian.org]

Imported Upstream version 0.5.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 14f31cee599d93c62cdc762e5179af63f3f04a02
X-Git-Newrev: 830e47af25a9d064a8ba98ca95dc2f63155ed595

The following commit has been merged in the master branch:
commit 830e47af25a9d064a8ba98ca95dc2f63155ed595
Merge: 14f31cee599d93c62cdc762e5179af63f3f04a02 46c56ccc67f84eb72be9da24946619b04646eec6
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Feb 8 20:44:37 2012 +0100

    Merge commit 'upstream/0.5.4'


-- 
libavc1394 packaging