[libnl3/f18: 2/2] Merge branch 'master' into f18

[Jiří Pírko]

commit f0492dddeff042fb4f08c4b09045e4309f68fd23
Merge: f309ca5 58e36d0
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Wed Jan 30 09:47:30 2013 +0100

    Merge branch 'master' into f18

 .gitignore  |    2 ++
 libnl3.spec |    5 ++++-
 sources     |    4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)
---