I have no idea what I'm doing...

merged ip-addr from mac-addr generation check from temp branch to accomodate different generation alg

Conflicts:

	core/net/uip-ds6.c
	core/net/uip.h