Merge proposals dependent on lp://qastaging/~bmillemathias/ubuntu/lucid/bluez/main

1. Lucid (10.04)
2. main
3. Dependent merge proposals