From: root <root@cassidy.cs.princeton.edu>
Date: Fri, 3 Jun 2011 07:40:26 +0000 (-0400)
Subject: Merge commit 'origin/master'
X-Git-Tag: iproute2-2.6.38-0~2
X-Git-Url: http://git.onelab.eu/?p=iproute2.git;a=commitdiff_plain;h=a7f9baa113b1bfed551e578ae72ca6cd3be75d06

Merge commit 'origin/master'
---

a7f9baa113b1bfed551e578ae72ca6cd3be75d06
diff --cc iproute.spec
index c1d2a34,b0b066a..19624c2
--- a/iproute.spec
+++ b/iproute.spec
@@@ -1,10 -1,5 +1,5 @@@
- #
- # $Id$
- #
- %define url $URL$
- 
  %define name iproute
 -%define version 2.6.37
 +%define version 2.6.38
  %define taglevel 0
  
  %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}}