am 09e7ef8a: am a5bfe52d: Merge change Ib3558f35 into eclair-mr2

Merge commit '09e7ef8aadb480349e9f63dcab155cb466296e92'

* commit '09e7ef8aadb480349e9f63dcab155cb466296e92':
  Make our choice of surface explicit.