merge r21288
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 2 May 2010 00:45:51 +0000 (00:45 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 2 May 2010 00:45:51 +0000 (00:45 +0000)
commit02a7fe2a8194cf9dc50727864e2d85fdc444dd91
tree8887681d204b5a39b90383f3b7f0c4f82814076e
parentcfebfa49a46ccc3953f14a4bc6d962ad65d61dc9
merge r21288

SVN-Revision: 21289
package/nvram/Makefile
package/nvram/src/cli.c