fix conflict

diff --cc vsys-scripts.spec
index 8f98966,261afc9..5ae886f
--- 1/vsys-scripts.spec
--- 2/vsys-scripts.spec
+++ b/vsys-scripts.spec
@@@ -54,9 -54,14 +54,17 @@@ rm -rf $RPM_BUILD_ROO
  %postun
  
  %changelog
+ * Mon Oct 11 2010 Sapan Bhatia <sapanb@cs.princeton.edu> - vsys-scripts-0.95-22
+ - vif_up has now been modified with the ability to create tap devices and to be able to SNAT over randomly selected
+ - ports. Thanks to Matthias Goerner for his help developing and testing these changes.
+ 
+ * Fri Sep 17 2010 Sapan Bhatia <sapanb@cs.princeton.edu> - vsys-scripts-0.95-21
+ - Added script fd_packetseer, also updated tun/tap script to be able to create tun devices in addition to tap devices
+ - and other minor changes.
+ 
 +* Mon Jul 19 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - vsys-scripts-0.95-20
 +- fix dotsshmount
 +
  * Thu Jul 01 2010 Baris Metin <Talip-Baris.Metin@sophia.inria.fr> - vsys-scripts-0.95-19
  - change dotsshmount's mount point