Merge proposals dependent on lp:~james-page/ubuntu/oneiric/asterisk/merge-from-debian

1. Oneiric (11.10)
2. merge-from-debian
3. Dependent merge proposals