merge r23256, r23257 and r23258
authorJo-Philipp Wich <jow@openwrt.org>
Thu, 7 Oct 2010 15:06:15 +0000 (15:06 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Thu, 7 Oct 2010 15:06:15 +0000 (15:06 +0000)
commit232cf84e52e59d4d42778712269bdfb2127d92a5
tree1c796ff422bb8282ce9adf31b389df832ec2d071
parent7b34fc60c453c93ae98115f04173592f6477ac4e
merge r23256, r23257 and r23258

SVN-Revision: 23295
include/package-ipkg.mk
package/base-files/Makefile
package/base-files/files/etc/sysupgrade.conf [new file with mode: 0644]
package/base-files/files/lib/upgrade/keep.d/base-files-essential [new file with mode: 0644]
package/base-files/files/sbin/sysupgrade
tools/ipkg-utils/patches/170-resolve_conffiles.patch [new file with mode: 0644]