Resolved conflict
Sapan Bhatia [Mon, 30 Jan 2012 16:37:55 +0000 (11:37 -0500)]
1  2 
openvswitch.spec

Simple merge