Merge "Minor corrections for SR1"
authorMorgan Richomme <morgan.richomme@orange.com>
Thu, 24 Sep 2015 13:42:44 +0000 (13:42 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 24 Sep 2015 13:42:44 +0000 (13:42 +0000)

Trivial merge