Merge "With the unrelated karaf dependency issues not seen (for now) reenabling karaf...
authorDave Tucker <djt@redhat.com>
Fri, 5 Sep 2014 12:30:34 +0000 (12:30 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 5 Sep 2014 12:30:34 +0000 (12:30 +0000)

Trivial merge