Merge "Update doc"
authorMorgan Richomme <morgan.richomme@orange.com>
Fri, 29 Jan 2016 08:27:55 +0000 (08:27 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 29 Jan 2016 08:27:56 +0000 (08:27 +0000)

Trivial merge