Merge proposals dependent on lp://staging/~clint-fewbar/ubuntu/maverick/libmemcached/fix-conflicting-control

1. Maverick (10.10)
2. fix-conflicting-control
3. Dependent merge proposals