Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6