merge r22949
authorJo-Philipp Wich <jow@openwrt.org>
Tue, 7 Sep 2010 21:20:34 +0000 (21:20 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Tue, 7 Sep 2010 21:20:34 +0000 (21:20 +0000)
commit8f16494eafc97db3f229f44fbf0b2a6b0a15a194
tree7e04683ec887c37da8354bb80d9c370a4e2bed64
parent4d2e5085d6277bd730648d80704ce2931beba564
merge r22949

SVN-Revision: 22972
include/package-ipkg.mk
target/imagebuilder/files/Makefile