Merge "Update for Arno"
authorMorgan Richomme <morgan.richomme@orange.com>
Wed, 3 Jun 2015 15:52:08 +0000 (15:52 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 3 Jun 2015 15:52:08 +0000 (15:52 +0000)

Trivial merge