Merge proposals dependent on lp://staging/~hudson-ubuntu/ubuntu/natty/jmdns/hudson-fix

1. Natty (11.04)
2. hudson-fix
3. Dependent merge proposals