Merge "Added conflict handling between configuration and state choice nodes. -unique...
authorEd Warnicke <eaw@cisco.com>
Mon, 9 Dec 2013 18:14:09 +0000 (18:14 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 9 Dec 2013 18:14:09 +0000 (18:14 +0000)

Trivial merge