merge r22377
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 24 Jul 2010 15:48:29 +0000 (15:48 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 24 Jul 2010 15:48:29 +0000 (15:48 +0000)
commit87c783678da0cc7152b78bb3a37c49f100a776f8
tree803ce4600b17100697b46fb38b6f0e924aa3272b
parentb615dfaf8ecf5b99bca0d91273b8686315167865
merge r22377

SVN-Revision: 22378
package/base-files/Makefile
package/base-files/files/lib/preinit/40_mount_jffs2