Merge change I1f1c7bad into eclair-mr2

* changes:
  I accidentally broke this code while refactoring MediaScanner. This is the fix.