luci-0.11: merge r9356 - r9360
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 8 Oct 2012 11:42:27 +0000 (11:42 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 8 Oct 2012 11:42:27 +0000 (11:42 +0000)

Trivial merge