Merge "Misc fix for some error seen during IT and javadoc"
authorAlessandro Boch <aboch@cisco.com>
Tue, 27 Aug 2013 20:40:36 +0000 (20:40 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 27 Aug 2013 20:40:36 +0000 (20:40 +0000)

Trivial merge