Merge "Fixed for bug 1197"
authorEd Warnicke <eaw@cisco.com>
Fri, 1 Aug 2014 02:31:30 +0000 (02:31 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 1 Aug 2014 02:31:30 +0000 (02:31 +0000)

Trivial merge