luci-0.9: merge r5516
luci-0.9: merge r5516

git-svn-id: 4bcb7a644239419742a060973119cd496034772b@5517 ab181a69-ba2e-0410-a84d-ff88ab4c47bc

alxhh/piratenluci,alxhh/piratenluci,alxhh/piratenluci,alxhh/piratenluci,alxhh/piratenluci,alxhh/piratenluci,alxhh/piratenluci