Merge "bug 152"
authorEd Warnicke <eaw@cisco.com>
Tue, 19 Nov 2013 14:24:18 +0000 (14:24 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Tue, 19 Nov 2013 14:24:18 +0000 (14:24 +0000)

Trivial merge