Merge "Partial fix for Bug 1256"
authorEd Warnicke <eaw@cisco.com>
Mon, 30 Jun 2014 15:54:08 +0000 (15:54 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 30 Jun 2014 15:54:08 +0000 (15:54 +0000)

Trivial merge