[libmnl/el5: 4/4] Merge branch 'master' into el5

[Hushan Jia]

commit 59919f153deab607c020154963dba5eba227cd81
Merge: 6bfc9ed 86dba96
Author: Hushan Jia <hushan.jia at gmail.com>
Date:   Mon Jun 11 22:00:33 2012 +0800

    Merge branch 'master' into el5
    
    Conflicts:
    	libmnl.spec
    	sources

 .gitignore  |    2 ++
 libmnl.spec |    5 ++++-
 sources     |    4 ++++
 3 files changed, 10 insertions(+), 1 deletions(-)
---
diff --cc sources
index 532fbf3,28211b1..5d6ec18
--- a/sources
+++ b/sources
@@@ -1,2 -1,1 +1,6 @@@
++<<<<<<< HEAD
 +e936236bb57a2375afa4e70e75dc3ba9  libmnl-1.0.1.tar.bz2
 +370d02d10bdf2e987c29385eca2d758b  libmnl-1.0.2.tar.bz2
++=======
+ 7d95fc3bea3365bc03c48e484224f65f  libmnl-1.0.3.tar.bz2
++>>>>>>> master