am 386d8871: Merge change I0bda9c39 into eclair

Merge commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a' into eclair-mr2

* commit '386d8871dc24bfcc91a1d9f7b228a13745bed60a':
  One camera is probably sufficient