fixed conflicts with gnome-bluetooth #12

Merged
merged 4 commits into from Nov 27, 2011

2 participants