Merge "OF1.0 fixes"
authorDaniel Bartos <daniel.bartos@pantheon.sk>
Tue, 10 Dec 2013 07:13:52 +0000 (07:13 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 10 Dec 2013 07:13:52 +0000 (07:13 +0000)

Trivial merge