am d04e2557: Merge change I9e4ded20 into eclair

Merge commit 'd04e2557d23686f506335e3bbe3e55ffbdcba9a4' into eclair-mr2

* commit 'd04e2557d23686f506335e3bbe3e55ffbdcba9a4':
  Make headset buttons behave more like the in-app buttons, by seeking