Dailies for 20130106.
Merge branch 'jen' of l3:~/jairo into jen
Dailies for 20130106 and fixing wan network page commit flop.
Fixing libs.php (again) and the wan page.