[backfire] merge r23114
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 23 Sep 2010 17:33:52 +0000 (17:33 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Thu, 23 Sep 2010 17:33:52 +0000 (17:33 +0000)
commit3b6dd118509ef8a0d90444d14ebdaac2a62dae49
treecf402ee579e66bef82ca6dc3357c00daf412a5bf
parent8128ab0f591e76e00ff68deaae8fcce4f948b59e
[backfire] merge r23114

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23115 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/base-files/files/lib/preinit/41_merge_overlay_hooks