Merge branch 'master' of git://1984.lsi.us.es/nf
authorJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 21 Feb 2013 16:07:14 +0000 (17:07 +0100)
committerJozsef Kadlecsik <kadlec@blackhole.kfki.hu>
Thu, 21 Feb 2013 16:07:14 +0000 (17:07 +0100)

Trivial merge