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

[Jiří Pírko]

commit a26c8f3f0962d5878618864efce1c2db969b226e
Merge: 8aceb13 58e36d0
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Wed Jan 30 11:12:49 2013 +0100

    Merge branch 'master' into f17

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