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

[Jiří Pírko]

commit 8e44f570eba48c21a94e9c903944f10ec00b5ddd
Merge: 68ce3c6 667b9a6
Author: Jiri Pirko <jiri at resnulli.us>
Date:   Thu Jan 17 15:28:58 2013 +0100

    Merge branch 'master' into f18

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