Added by Apollon Oikonomopoulos over 13 years ago
Merge previous changes
Conflicts: nfdhcpd: merge
Signed-off-by: Apollon Oikonomopoulos <apollon@noc.grnet.gr>