luci-0.11: merge r9353 and r9354
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 7 Oct 2012 12:06:21 +0000 (12:06 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 7 Oct 2012 12:06:21 +0000 (12:06 +0000)

Trivial merge