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

[Paul Wouters]

commit 0198f7c4284ca9bc7ff5a239c6e556b90f125b73
Merge: f0492dd c02ff76
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Oct 7 16:14:56 2013 -0400

    Merge branch 'master' into f18

 .gitignore                |    2 ++
 libnl-3.2.22-963111.patch |   17 +++++++++++++++++
 libnl3.spec               |   13 +++++++++++--
 sources                   |    4 ++--
 4 files changed, 32 insertions(+), 4 deletions(-)
---