merged to wheezy branch
merged to wheezy branch

torkelsson/ganglia-web,ganglia/ganglia-web,luckypoem/ganglia-web,luckypoem/ganglia-web,luckypoem/ganglia-web,luckypoem/ganglia-web,torkelsson/ganglia-web,torkelsson/ganglia-web,luckypoem/ganglia-web,torkelsson/ganglia-web,ganglia/ganglia-web,torkelsson/ganglia-web,ganglia/ganglia-web,ganglia/ganglia-web,ganglia/ganglia-web