am c06bb82f: Merge "Fixing bug #2591288" into froyo

Merge commit 'c06bb82f37f476813ea69dfd9f1514551719ac3b' into kraken

* commit 'c06bb82f37f476813ea69dfd9f1514551719ac3b':
  Fixing bug #2591288