[libnl3/f17: 5/5] Merge branch 'master' into f17

[Jiří Pírko]

commit 8aceb13ad1b59a265ee89bc585c02ac5f3005ed1
Merge: c8c2393 f38f309
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Wed Jan 23 16:23:24 2013 +0100

    Merge branch 'master' into f17

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