Added renato@'s L2VPN LDPd patch