luci-0.11: merge r9351
authorJo-Philipp Wich <jow@openwrt.org>
Sat, 6 Oct 2012 23:50:52 +0000 (23:50 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sat, 6 Oct 2012 23:50:52 +0000 (23:50 +0000)

Trivial merge