Merge proposals dependent on lp://qastaging/~dev-nigelj/ubuntu/oneiric/zabbix/721707

1. Oneiric (11.10)
2. 721707
3. Dependent merge proposals