Merge "Fixed merge job breakage."
authorTony Tkacik <ttkacik@cisco.com>
Wed, 27 Aug 2014 14:08:47 +0000 (14:08 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 27 Aug 2014 14:08:47 +0000 (14:08 +0000)

Trivial merge