ofproto: Fix merge error from commit e20567b044.
authorTom Everman <teverman@google.com>
Thu, 2 Sep 2010 18:08:53 +0000 (11:08 -0700)
committerBen Pfaff <blp@nicira.com>
Thu, 2 Sep 2010 18:12:07 +0000 (11:12 -0700)
commite9ec7451755a50449811738b5a0adad49a864fe3
tree037a0b9d7f3136b29044bb894c6138b0a575beb4
parentd90c986fefa7f171b49e9130dad7d7b9c943ee58
ofproto: Fix merge error from commit e20567b044.
ofproto/ofproto.c