Merge commit '32d8571f509c392dca732c243e9b2138c15daecf' into eclair-plus-aosp * commit '32d8571f509c392dca732c243e9b2138c15daecf': Changes for BT 2.1
Merge commit '32d8571f509c392dca732c243e9b2138c15daecf' into eclair-plus-aosp * commit '32d8571f509c392dca732c243e9b2138c15daecf': Changes for BT 2.1