merge r22708
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 19 Aug 2010 00:59:48 +0000 (00:59 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 19 Aug 2010 00:59:48 +0000 (00:59 +0000)
commitf6164b2d783c2438db3f012b2708070e394f750c
treef2466fbb88f974c290e55d6f52ec9bd021458048
parentbf3a292db0df69b01829eb0cf85c4137fe13eeb6
merge r22708

SVN-Revision: 22709
package/6in4/Makefile
package/6in4/files/6in4.sh