merge r23528
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 19 Oct 2010 02:08:07 +0000 (02:08 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 19 Oct 2010 02:08:07 +0000 (02:08 +0000)
commit837e26dff1f8f40198e51512dfde67880642cb48
tree792b0b4e8c5cbf0e4bb67b2f4b125ca4b7ae9f9e
parentd67734d786fc95a7dce3ca97da82713a102dab3a
merge r23528

SVN-Revision: 23529
package/6in4/Makefile
package/6in4/files/6in4.hotplug