Merge commit 'holger/strings'
authorMichael Brown <mcb30@etherboot.org>
Thu, 23 Aug 2007 20:51:57 +0000 (21:51 +0100)
committerMichael Brown <mcb30@etherboot.org>
Thu, 23 Aug 2007 20:51:57 +0000 (21:51 +0100)
1  2 
src/include/compiler.h
src/include/gpxe/dhcp.h
src/net/ipv6.c

Simple merge
Simple merge
diff --cc src/net/ipv6.c
Simple merge