Hackedy hackedy hack
Merge remote branch 'origin/master'

Conflicts:
	ospf6d/ospf6_auto.c