Merge "BUG-2159: fix sort() conflict"
authorTony Tkacik <ttkacik@cisco.com>
Thu, 9 Oct 2014 16:07:24 +0000 (16:07 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 9 Oct 2014 16:07:24 +0000 (16:07 +0000)

Trivial merge