luci-0.10: merge r8144
luci-0.10: merge r8144

git-svn-id: 8d4f27451a662879399efcb2999a4003f2c6bb9f@8145 ab181a69-ba2e-0410-a84d-ff88ab4c47bc

projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark,projectbismark/luci-bismark