Merge changes
authorGerrit Code Review <gerrit@opendaylight.org>
Thu, 21 Nov 2013 15:39:34 +0000 (15:39 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 21 Nov 2013 15:39:34 +0000 (15:39 +0000)

Trivial merge