luci-0.10: merge r6695 and r6696
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Jan 2011 00:44:43 +0000 (00:44 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 10 Jan 2011 00:44:43 +0000 (00:44 +0000)

Trivial merge