[SCM] Debian GNU Hurd packaging branch, upstream-merged, updated. upstream/20120222-3-g9241177

[Samuel Thibault]

The following commit has been merged in the upstream-merged branch:
commit 92411777bda58f75eb98fa252b4834477435229a
Merge: 2c38ab5c52fd8e1766110329708ea9c19827efac 
7cc85666a6d9f77931955071e5b374292df81ef0
Author: Samuel Thibault <samuel.thiba...@ens-lyon.org>
Date:   Sun Apr 8 02:31:00 2012 +0200

    Merge branch 'upstream-merged' of git.debian.org:/git/pkg-hurd/hurd into 
upstream-merged
    
    Conflicts:
        pfinet/ethernet.c


-- 
Debian GNU Hurd packaging